Fix "--extension=" with empty parameter

diff --git a/KNOWN_BUGS.markdown b/KNOWN_BUGS.markdown
index 1fed3e584022c0219418916c03a178926a8b165d..3ca772832a64723119719c1dfc6db3c8cd22b6ed 100644 (file)
--- a/KNOWN_BUGS.markdown
+++ b/KNOWN_BUGS.markdown
@@ -35,8 +35,6 @@ Bugs to fix rather soon
 
 * `xen-list-images` does not honour `--extension`
 
-* `--extension=''` (i.e. empty string) no more works
-
 
 Bugs to fix later
 -----------------

diff --git a/bin/xen-create-image b/bin/xen-create-image
index c07d29bd5754cac5fa2244e085c81e508a63de55..3643ae4cb904990285d668b3e6caf198d585b95f 100755 (executable)
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -1668,7 +1668,7 @@ sub parseCommandLineArguments
             "keep",         \$CONFIG{ 'keep' },
             "template=s",   \&checkOption,
             "output=s",     \&checkOption,
-            "extension=s",  \&checkOption,
+            "extension:s",  \&checkOption,
             "dontformat",   \&checkOption,
 
             # Help options

diff --git a/bin/xt-create-xen-config b/bin/xt-create-xen-config
index 576112a1a7ca46c9714b500d17914b8cf6d26e46..1c7e8ddc4a6598a153ac590148f481dc9d59d7ba 100755 (executable)
--- a/bin/xt-create-xen-config
+++ b/bin/xt-create-xen-config
@@ -215,7 +215,7 @@ sub parseCommandLineArguments
     #
     GetOptions( "admins=s",    \$ENV{ 'admins' },
                 "output=s",    \$CONFIG{ 'output' },
-                "extension=s", \$CONFIG{ 'extension' },
+                "extension:s", \$CONFIG{ 'extension' },
                 "template=s",  \$CONFIG{ 'template' },
                 "verbose",     \$CONFIG{ 'verbose' },
                 "help",        \$HELP,

diff --git a/debian/changelog b/debian/changelog
index 77378fc4afdeac26cf5c87f04213ca57277b63be..7da699462ca6fb4fe12119015367aecb44a81d63 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xen-tools (4.4~dev-1) UNRELEASED; urgency=low
     - Also recognize "M" and "G" instead of "MB" and "GB" as size unit for
       --memory. (Closes: #691320) Document the recognized units.
     - Default DomUs to use the noop scheduler (Closes: #693131)
+    - Fixes "--extension=" with empty parameter.
     - Remove CVS revisions from --version output
     - Preliminary support for Debian Jessie and Ubuntu Raring
     - Preliminary support for xl toolstack

diff --git a/t/getopt.t b/t/getopt.t
index 702049e6a6b7f00f629fde2d6d32734c0d42e047..12070d24d44eb41bf17c2be1ac820aa8243fd36b 100755 (executable)
--- a/t/getopt.t
+++ b/t/getopt.t
@@ -114,9 +114,9 @@ sub testFile
             }
 #print " - remove quotes : $o ";
             #
-            #  Discard anything after "=", or " "
+            #  Discard anything after "=", ":", or " "
             #
-            if ( $o =~ /(.*)[ \t=]+(.*)/ )
+            if ( $o =~ /(.*)[ \t=:]+(.*)/ )
             {
                 $o = $1;
             }