[Xen-changelog] [xen-unstable] Merge.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Steven Smith <ssmith@xxxxxxxxxxxxx>
# Node ID bdace8da631977135ea87082d1b788bb0c161839
# Parent  cdd03c7ec8d33df2f382015b781b2d1e5f095b6e
# Parent  3499b3271e5fd6d64ebc8b3c8db1f7c2070b3841
Merge.
---
 tools/python/xen/xm/dry-run.py |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff -r cdd03c7ec8d3 -r bdace8da6319 tools/python/xen/xm/dry-run.py
--- a/tools/python/xen/xm/dry-run.py    Fri Sep 22 17:22:18 2006 +0100
+++ b/tools/python/xen/xm/dry-run.py    Fri Sep 22 17:59:02 2006 +0100
@@ -32,8 +32,9 @@ def help():
     individually along with the final security decision."""
 
 def main (argv):
-    if len(argv) != 2:
-        raise OptionError('Invalid number of arguments')
+    try:
+        if len(argv) != 2:
+            raise OptionError('Invalid number of arguments')
 
         passed = 0
         (opts, config) = create.parseCommandLine(argv)
@@ -42,7 +43,7 @@ def main (argv):
                 passed = 1
         else:
             print "Checking resources: (skipped)"
-
+                
         if passed:
             print "Dry Run: PASSED"
         else:

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog