Ticket #5231: partition_patch.diff

InstalledPackageInfo.cpp

@@ -213 +213 @@
     // Try to remove all entries that are present in the list
     for (i = 0; i < count; i++) {
         iter = static_cast<BString *>(fInstalledItems.ItemAt(count - i - 1));
-        fprintf(stderr, "Removing: %s (%ld/%ld)\n", iter->String(), i, count);
         ret = entry.SetTo(iter->String());
         if (ret == B_BUSY) {
             // The entry's directory is locked - wait a few cycles for it to
@@ -235 +234 @@
             return fStatus;
         }
 
-        fprintf(stderr, "...we continue\n");
-
         if (entry.Exists() && entry.Remove() != B_OK) {
-            fprintf(stderr, "\n%s\n", strerror(ret));
             fStatus = B_ERROR;
             return fStatus;
         }

PackageView.cpp

@@ -603 +603 @@
         }
         else if (prof->path_type == P_USER_PATH) {
             BString name;
+            bool defaultPathSet = false;
             char sizeString[32], volumeName[B_FILE_NAME_LENGTH];
             BVolumeRoster roster;
             BDirectory mountPoint;
 
             while (roster.GetNextVolume(&volume) != B_BAD_VALUE) {
                 if (volume.IsReadOnly() ||
+                        !volume.IsPersistent() ||
                         volume.GetRootDirectory(&mountPoint) != B_OK)
                     continue;
 
@@ -625 +627 @@
                 item = new BMenuItem(name.String(), temp);
                 item->SetTarget(this);
                 fDestination->AddItem(item);
+
+                // The first volume becomes the default element
+                if (!defaultPathSet) {
+                    item->SetMarked(true);
+                    fCurrentPath.SetTo(path.Path());
+                    defaultPathSet = true;
+                }
             }
 
             fDestField->SetEnabled(true);