diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | cobbler/utils.py | 2 |
3 files changed, 3 insertions, 1 deletions
@@ -7,6 +7,7 @@ Cobbler is written & maintained by: Patches and other contributions from: + David Brown <dmlb2000@gmail.com> James Bowes <jbowes@redhat.com> C. Daniel Chase <dan@cdchase.com> Máirín Duffy <duffy@redhat.com> @@ -5,6 +5,7 @@ Cobbler CHANGELOG - Make createrepo get run for local cobbler reposync invocations as needed - patch to allow yumopts to override gpgcheck - applied patch to send hostname from ISC +- added patch to allow --kopts/--ksmeta items to be cleared with --kopts=delete - ??? - 0.8.3 - fix WebUI documentation URL diff --git a/cobbler/utils.py b/cobbler/utils.py index 069d440..c6a6154 100644 --- a/cobbler/utils.py +++ b/cobbler/utils.py @@ -240,7 +240,7 @@ def input_string_or_hash(options,delim=","): if options == "<<inherit>>": options = {} - if options is None: + if options is None or options == "delete": return (True, {}) elif type(options) == list: raise CX(_("No idea what to do with list: %s") % options) |