[haiku-commits] haiku: hrev48273 - src/apps/packageinstaller
- From: pulkomandy@xxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 10 Nov 2014 15:28:21 +0100 (CET)
hrev48273 adds 1 changeset to branch 'master'
old head: e0dbadfc4e76ff5a90d56834b9ab53301c8700df
new head: 41bfed9f20d1fad36afdc6781dab2007402c3711
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=41bfed9+%5Ee0dbadf
----------------------------------------------------------------------------
41bfed9: PackageInstaller: rewrite /boot/beos/system to /boot/system
Fixes #10603.
[ Adrien Destugues <pulkomandy@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev48273
Commit: 41bfed9f20d1fad36afdc6781dab2007402c3711
URL: http://cgit.haiku-os.org/haiku/commit/?id=41bfed9
Author: Adrien Destugues <pulkomandy@xxxxxxxxx>
Date: Mon Nov 10 14:27:46 2014 UTC
Ticket: https://dev.haiku-os.org/ticket/10603
----------------------------------------------------------------------------
1 file changed, 6 insertions(+), 1 deletion(-)
src/apps/packageinstaller/PackageItem.cpp | 7 ++++++-
----------------------------------------------------------------------------
diff --git a/src/apps/packageinstaller/PackageItem.cpp
b/src/apps/packageinstaller/PackageItem.cpp
index 71dfe84..ca547e6 100644
--- a/src/apps/packageinstaller/PackageItem.cpp
+++ b/src/apps/packageinstaller/PackageItem.cpp
@@ -187,6 +187,8 @@ PackageItem::InitPath(const char* path, BPath* destination)
} else if (fPathType == P_SYSTEM_PATH) {
if (gVerbose)
printf("InitPath - absolute: %s\n", fPath.String());
+ if (fPath == "")
+ fPath = "/";
ret = destination->SetTo(fPath.String());
} else {
if (gVerbose)
@@ -597,9 +599,12 @@ PackageScript::DoInstall(const char* path, ItemState*
state)
// but it would be less save.
For example, an app
// could have a folder named
"config/be..." inside
// its installation folder.
- // TODO: Use find_paths() or we
are no better than
+ // TODO: Use find_paths() or we
are no better than
// these scripts.
script.ReplaceAll(
+ "/boot/beos/system/",
+ "/boot/system/");
+ script.ReplaceAll(
"~/config/be",
"~/config/settings/deskbar/menu");
script.ReplaceAll(
Other related posts:
- » [haiku-commits] haiku: hrev48273 - src/apps/packageinstaller - pulkomandy
