Radish alpha
H
HardenedBSD Package Manager
Radicle
Git (anonymous pull)
Log in to clone via SSH
fullpath in package conversion
Baptiste Daroussin committed 14 years ago
commit 3fc2659a1c2617603b74350ab6de870edf3dece5
parent 2c1f664531363b488034dcfc134decab57945538
1 file changed +3 -10
modified pkg2legacy/pkg2legacy.c
@@ -157,11 +157,10 @@ main(int argc, char **argv)
		sbuf_printf(sbuf, "@comment PKG_FORMAT_REVISION:1.1\n"
				"@name %s-%s\n"
				"@comment ORIGIN:%s\n"
-
				"@cwd %s\n",
+
				"@cwd /\n",
				pkg_get(pkg, PKG_NAME),
				pkg_get(pkg, PKG_VERSION),
-
				pkg_get(pkg, PKG_ORIGIN),
-
				pkg_get(pkg, PKG_PREFIX));
+
				pkg_get(pkg, PKG_ORIGIN));

		if ((deps = pkg_deps(pkg)) != NULL) {
			for (i = 0; deps[i] != NULL; i++) {
@@ -198,13 +197,7 @@ main(int argc, char **argv)

			size = archive_entry_size(ae);

-
			strlcpy(destpath, archive_entry_pathname(ae), MAXPATHLEN);
-
			if (strncmp(destpath, pkg_get(pkg, PKG_PREFIX), strlen(pkg_get(pkg, PKG_PREFIX))) == 0)
-
				newpath = destpath + strlen(pkg_get(pkg, PKG_PREFIX));
-
			else {
-
				sbuf_cat(sbuf, "@cwd /");
-
				newpath = destpath;
-
			}
+
			newpath = archive_entry_pathname(ae);

			if (newpath[0] == '/')
				newpath++;