[haiku-commits] r41026 - haiku/trunk/src/apps/installer

From: superstippi@xxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Sat, 19 Mar 2011 14:49:29 +0100 (CET)
Author: stippi
Date: 2011-03-19 14:49:28 +0100 (Sat, 19 Mar 2011)
New Revision: 41026
Changeset: https://dev.haiku-os.org/changeset/41026
Ticket: https://dev.haiku-os.org/ticket/7367

Modified:
   haiku/trunk/src/apps/installer/CopyEngine.cpp
   haiku/trunk/src/apps/installer/CopyEngine.h
Log:
Don't ignore the entire var directory, but rather only
the swap file specifically. There is already a TODO in
the code for replacing this mechanism with something
cleaner and more flexible. Resolves ticket #7367.


Modified: haiku/trunk/src/apps/installer/CopyEngine.cpp
===================================================================
--- haiku/trunk/src/apps/installer/CopyEngine.cpp       2011-03-19 11:47:18 UTC 
(rev 41025)
+++ haiku/trunk/src/apps/installer/CopyEngine.cpp       2011-03-19 13:49:28 UTC 
(rev 41026)
@@ -107,10 +107,10 @@
        // makes sense, since passing a volume is meant to folders that are
        // volume specific, like "trash".
        BPath path(source);
-       if (path.Append("common/var") == B_OK)
-               fVarDirectory.SetTo(path.Path());
+       if (path.Append("common/var/swap") == B_OK)
+               fSwapFileEntry.SetTo(path.Path());
        else
-               fVarDirectory.Unset();
+               fSwapFileEntry.Unset();
 }
 
 
@@ -535,9 +535,9 @@
                        return false;
                }
        }
-       if (fVarDirectory == entry) {
+       if (fSwapFileEntry == entry) {
                // current location of var
-               printf("ignoring common/'%s'.\n", name);
+               printf("ignoring swap file\n");
                return false;
        }
        return true;

Modified: haiku/trunk/src/apps/installer/CopyEngine.h
===================================================================
--- haiku/trunk/src/apps/installer/CopyEngine.h 2011-03-19 11:47:18 UTC (rev 
41025)
+++ haiku/trunk/src/apps/installer/CopyEngine.h 2011-03-19 13:49:28 UTC (rev 
41026)
@@ -110,7 +110,7 @@
 
        // TODO: Should be made into a list of BEntris to be ignored, perhaps.
        // settable by method...
-                       BEntry                          fVarDirectory;
+                       BEntry                          fSwapFileEntry;
 };
[haiku-commits] r41026 - haiku/trunk/src/apps/installer

Other related posts:
