Changeset 54985 in vbox for trunk/src/VBox
- Timestamp:
- Mar 27, 2015 7:48:27 AM (10 years ago)
- Location:
- trunk/src/VBox
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VBoxManage/VBoxManageAppliance.cpp
r54983 r54985 642 642 if (findArgValue(strOverride, pmapArgs, strTypeArg)) 643 643 { 644 if (!optionsList.contains(ImportOptions_ImportToVDI))644 if (!optionsList.contains(ImportOptions_ImportToVDI)) 645 645 { 646 646 RTUUID uuid; … … 711 711 * except CD/DVD disks 712 712 */ 713 if (optionsList.contains(ImportOptions_ImportToVDI))713 if (optionsList.contains(ImportOptions_ImportToVDI)) 714 714 { 715 715 ComPtr<IVirtualBox> pVirtualBox = arg->virtualBox; -
trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp
r54979 r54985 652 652 * Remove last extension from the file name if the file is compressed 653 653 */ 654 if (di.strCompression.compare("gzip", Utf8Str::CaseInsensitive)==0)654 if (di.strCompression.compare("gzip", Utf8Str::CaseInsensitive)==0) 655 655 { 656 656 strTargetPath.stripSuffix(); … … 693 693 * Remove last extension from the file name if the file is compressed 694 694 */ 695 if (di.strCompression.compare("gzip", Utf8Str::CaseInsensitive)==0)695 if (di.strCompression.compare("gzip", Utf8Str::CaseInsensitive)==0) 696 696 { 697 697 strTargetPath.stripSuffix(); … … 3152 3152 uint32_t cImportedDisks = 0; 3153 3153 3154 while (oit != stack.mapDisks.end() && cImportedDisks != avsdeHDs.size())3154 while (oit != stack.mapDisks.end() && cImportedDisks != avsdeHDs.size()) 3155 3155 { 3156 3156 ovf::DiskImage diCurrent = oit->second; … … 3224 3224 { 3225 3225 /* current opened file isn't the same as passed one */ 3226 if (availableImage.compare(diCurrent.strHref, Utf8Str::CaseInsensitive) != 0)3226 if (availableImage.compare(diCurrent.strHref, Utf8Str::CaseInsensitive) != 0) 3227 3227 { 3228 3228 /*
Note:
See TracChangeset
for help on using the changeset viewer.