i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed bug #2101 : normalize user paths, use localType for links

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25081 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2008-04-20 15:57:54 +00:00
parent 8db2e37492
commit 27ec8243b2
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/packageinstaller/PackageInfo.cpp
+6 -2
View File
@@ -572,6 +572,8 @@ PackageInfo::Parse()
fPackageFile->Read(pathname, length); fPackageFile->Read(pathname, length);
pathname[length] = 0; pathname[length] = 0;
BString *path = new BString(pathname); BString *path = new BString(pathname);
if (length > 0 && pathname[length - 1] == '/')
path->Remove(length - 1, 1);
userPaths.AddItem(path); userPaths.AddItem(path);
delete pathname; delete pathname;
} }
@@ -1025,8 +1027,10 @@ PackageInfo::Parse()
} }
} }
parser_debug("Adding link: %s!\n", dest.String()); parser_debug("Adding link: %s! (type %s)\n", dest.String(),
item = new PkgLink(fPackageFile, dest, linkString, pathType, pathType == P_SYSTEM_PATH ? "System"
: (localType == P_INSTALL_PATH ? "Install" : "User"));
item = new PkgLink(fPackageFile, dest, linkString, localType,
ctime, mtime, mode, offset, size); ctime, mtime, mode, offset, size);
} }
} }