Fix "--extension=" with empty parameter
This commit is contained in:
@@ -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
|
||||
-----------------
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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,
|
||||
|
||||
1
debian/changelog
vendored
1
debian/changelog
vendored
@@ -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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user