Changeset 43063 in vbox

Timestamp:

Aug 29, 2012 9:54:36 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

80405

Message:

Main/Machine+VirtualBox: fix bugs related to directoryIncludesUUID create flag

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (2 diffs)
• src-server/MachineImpl.cpp (modified) (1 diff)
• src-server/VirtualBoxImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -1693 +1693 @@
 
         If the resulting settings file already exists, this method will fail,
-        unless @a forceOverwrite is set.
+        unless the forceOverwrite flag is set.
 
         The new machine is created unregistered, with the initial configuration
@@ -1765 +1765 @@
           "name=value" type entries. The following ones are recognized:
           <tt>forceOverwrite=1</tt> to overwrite an existing machine settings
-          file, and <tt>UUID=&lt;uuid&gt;</tt> to specify a machine UUID.
+          file, <tt>UUID=&lt;uuid&gt;</tt> to specify a machine UUID and
+          <tt>directoryIncludesUUID=1</tt> to switch to a special VM directory
+          naming scheme which should not be used unless necessary.
         </desc>
       </param>

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -9195 +9195 @@
             Utf8Str groupPlusName = Utf8StrFmt("%s%c%s",
                 group.c_str(), RTPATH_DELIMITER, name.c_str());
+            /** @todo hack, make somehow use of ComposeMachineFilename */
+            if (mUserData->s.fDirectoryIncludesUUID)
+                groupPlusName += Utf8StrFmt(" (%RTuuid)", mData->mUuid.raw());
             Utf8Str newGroupPlusName = Utf8StrFmt("%s%c%s",
                 newGroup.c_str(), RTPATH_DELIMITER, newName.c_str());
+            /** @todo hack, make somehow use of ComposeMachineFilename */
+            if (mUserData->s.fDirectoryIncludesUUID)
+                newGroupPlusName += Utf8StrFmt(" (%RTuuid)", mData->mUuid.raw());
             configDir = configFile;
             configDir.stripFilename();

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -1493 +1493 @@
                                     strGroup.c_str(),
                                     RTPATH_DELIMITER,
-                                    strName.c_str(),
+                                    strDirName.c_str(),
                                     RTPATH_DELIMITER,
                                     strName.c_str());