Changeset 28637 in vbox

Timestamp:

Apr 23, 2010 12:14:02 PM (15 years ago)

Author:

vboxsync

Message:

python shell: better progress handling

File:

• trunk/src/VBox/Frontends/VBoxShell/vboxshell.py (modified) (10 diffs)

trunk/src/VBox/Frontends/VBoxShell/vboxshell.py

@@ -225 +225 @@
             p.waitForCompletion(wait)
             ctx['global'].waitForEvents(0)
-        return 0
+        return 1
     except KeyboardInterrupt:
         print "Interrupted."
@@ -231 +231 @@
             print "Canceling task..."
             p.cancel()
-        return 1
-        
-
-
-def reportError(ctx,session,rc):
-    if not ctx['remote']:
-            print session.QueryErrorObject(rc)
-
+        return 0
+
+def reportError(ctx,progress):
+    print progress.errorInfo
 
 def createVm(ctx,name,kind,base):
@@ -269 +265 @@
     uuid = mach.id
     progress = vb.openRemoteSession(session, uuid, type, "")
-    progressBar(ctx, progress, 100)
-    completed = progress.completed
-    rc = int(progress.resultCode)
-    print "Completed:", completed, "rc:",hex(rc&0xffffffff)
-    if rc == 0:
+    if progressBar(ctx, progress, 100) and int(progress.resultCode) == 0:
         # we ignore exceptions to allow starting VM even if
         # perf collector cannot be started
@@ -286 +278 @@
         session.close()
     else:
-       reportError(ctx,session,rc)
+       reportError(ctx,progress)
 
 def getMachines(ctx, invalidate = False):
@@ -398 +390 @@
     print "Teleporting to %s:%d..." %(host,port)
     progress = console.teleport(host, port, passwd, maxDowntime)
-    progressBar(ctx, progress, 100)
-    completed = progress.completed
-    rc = int(progress.resultCode)
-    if rc == 0:
+    if progressBar(ctx, progress, 100) and int(progress.resultCode) == 0:
         print "Success!"
     else:
-        reportError(ctx,session,rc)
+        reportError(ctx,progress)
 
 
@@ -758 +747 @@
     print "executing %s with %s" %(args[0], args[1:])
     (progress, pid) = console.guest.executeProcess(args[0], 0, args[1:], [], "", "", "", user, passwd, tmo)
-    print "executed with pid %d" %(pid)
+    if progressBar(ctx,progress, 10):
+        print "executed with pid %d" %(pid)
+    else:
+        reportError(ctx, progress)
 
 def gexecCmd(ctx,args):
@@ -1301 +1293 @@
     desc.addDescription(ctx['global'].constants.VirtualSystemDescriptionType_License, license, "")
     p = app.write(format, path)
-    progressBar(ctx, p)
-    if (p.completed and int(p.resultCode) == 0):
+    if (progressBar(ctx, p) and int(p.resultCode) == 0):
         print "Exported to %s in format %s" %(path, format)
+    else:
+        reportError(ctx,p)
     return 0
 
@@ -1562 +1555 @@
    hdd = ctx['vb'].createHardDisk(format, loc)
    progress = hdd.createBaseStorage(size, ctx['global'].constants.MediumVariant_Standard)
-   ctx['progressBar'](progress)
-
-   if not hdd.id:
+   if progressBar(ctx,progress) and hdd.id:
+       print "created HDD at %s as %s" %(hdd.location, hdd.id)
+   else:
       print "cannot create disk (file %s exist?)" %(loc)
-      return 0
-
-   print "created HDD at %s as %s" %(hdd.location, hdd.id)
+      reportError(ctx,progress)
+      return 0
 
    return 0
@@ -1684 +1676 @@
 
    progress = hdd.deleteStorage()
-   ctx['progressBar'](progress)
+   progressBar(ctx,progress)
 
    return 0
@@ -1731 +1723 @@
 
    progress = dvd.deleteStorage()
-   ctx['progressBar'](progress)
-   print "Removed ISO at %s" %(dvd.location)
-
+   if progressBar(ctx,progress):
+       print "Removed ISO at %s" %(dvd.location)
+   else:
+       reportError(ctx,progress)
    return 0