[haiku-commits] haiku: hrev46904 - src/apps/packageinstaller

  • From: superstippi@xxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 21 Feb 2014 22:11:16 +0100 (CET)

hrev46904 adds 1 changeset to branch 'master'
old head: 09b0602fff09600ec6ad4f1f5bc05fe2ec606a8f
new head: 838c4c87790af97ef53e3a8ece82d5e66abe2b8b
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=838c4c8+%5E09b0602

----------------------------------------------------------------------------

838c4c8: PackageInstaller: Fix rewriting paths to system
  
  In BeOS, there was no /boot/system, there as /boot/beos/system. If memory
  serves. Fixes install location of GoBe Translators.

                                      [ Stephan Aßmus <superstippi@xxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev46904
Commit:      838c4c87790af97ef53e3a8ece82d5e66abe2b8b
URL:         http://cgit.haiku-os.org/haiku/commit/?id=838c4c8
Author:      Stephan Aßmus <superstippi@xxxxxx>
Date:        Fri Feb 21 21:09:29 2014 UTC

----------------------------------------------------------------------------

1 file changed, 2 insertions(+), 2 deletions(-)
src/apps/packageinstaller/PackageItem.cpp | 4 ++--

----------------------------------------------------------------------------

diff --git a/src/apps/packageinstaller/PackageItem.cpp 
b/src/apps/packageinstaller/PackageItem.cpp
index 05abbf6..f05baac 100644
--- a/src/apps/packageinstaller/PackageItem.cpp
+++ b/src/apps/packageinstaller/PackageItem.cpp
@@ -214,11 +214,11 @@ PackageItem::InitPath(const char* path, BPath* 
destination)
        if (pathString.FindFirst("non-packaged") < 0) {
                bool wasRewritten = false;
 
-               if (pathString.StartsWith("/boot/system")) {
+               if (pathString.StartsWith("/boot/beos/system")) {
                        BPath systemNonPackagedDir;
                        find_directory(B_SYSTEM_NONPACKAGED_DIRECTORY,
                                &systemNonPackagedDir);
-                       pathString.ReplaceFirst("/boot/system",
+                       pathString.ReplaceFirst("/boot/beos/system",
                                systemNonPackagedDir.Path());
                        wasRewritten = true;
                } else if (pathString.StartsWith("/boot/home/config")) {


Other related posts:

  • » [haiku-commits] haiku: hrev46904 - src/apps/packageinstaller - superstippi