Changeset 21998 in vbox for trunk/src/VBox

Timestamp:

Aug 5, 2009 2:09:09 PM (15 years ago)

Author:

vboxsync

Message:

Python shell: correct detection of home dir in remote case

File:

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

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

@@ -509 +509 @@
         print "    Image at: %s" %(vdvd.location)
         print "    Size: %s" %(vdvd.size)
+        print "    Id: %s" %(vdvd.id)
         print
 
@@ -806 +807 @@
 def reloadExtCmd(ctx, args):
    # maybe will want more args smartness
-   checkUserExtensions(ctx, commands, ctx['vb'].homeFolder)
+   checkUserExtensions(ctx, commands, getHomeFolder(ctx))
    autoCompletion(commands, ctx)
    return 0
@@ -1032 +1033 @@
         addExtsFromFile(ctx, cmds, os.path.join(shextdir,e))
 
+def getHomeFolder(ctx):
+    if ctx['remote'] or ctx['vb'] is None:
+        return os.path.join(os.path.expanduser("~"), ".VirtualBox")
+    else:
+        return ctx['vb'].homeFolder
+
 def interpret(ctx):
     if ctx['remote']:
@@ -1041 +1048 @@
     if vbox is not None:
         print "Running VirtualBox version %s" %(vbox.version)
-        ctx['perf'] = ctx['global'].getPerfCollector(ctx['vb'])
-        home = vbox.homeFolder
+        ctx['perf'] = ctx['global'].getPerfCollector(vbox)
     else:
         ctx['perf'] = None
-        home = os.path.join(os.path.expanduser("~"), ".VirtualBox")
-
+
+    home = getHomeFolder(ctx)
     checkUserExtensions(ctx, commands, home)