d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When packing installed package into a file (pkg_create -b) make sure to

Browse Source 
include all package files into resulting tarball.

PR:		34007
Submitted by:	olgeni

While I here:

- Remove bogus comment;
- ensure that we return the proper exit code in the case of -b failure.

MFC after:	5 days
This commit is contained in:
sobomax 2002-05-10 00:03:14 +00:00
parent 1894db5ac7
commit 1c2894552d
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
usr.sbin/pkg_install/create/perform.c
View File

@ -426,24 +426,31 @@ create_from_installed(const char *pkg, const char *suf)
snprintf(log_dir, sizeof(log_dir), "%s/%s", LOG_DIR, InstalledPkg);
if (!fexists(log_dir)) {
warnx("can't find package '%s' installed!", InstalledPkg);
return 1;
return FALSE;
}
getcwd(homedir, sizeof(homedir));
if (chdir(log_dir) == FAIL) {
warnx("can't change directory to '%s'!", log_dir);
return 1;
return FALSE;
}
/* Suck in the contents list */
plist.head = plist.tail = NULL;
fp = fopen(CONTENTS_FNAME, "r");
if (!fp) {
warnx("unable to open %s file", CONTENTS_FNAME);
return 1;
return FALSE;
}
/* If we have a prefix, add it now */
read_plist(&plist, fp);
fclose(fp);
Install = isfile(INSTALL_FNAME) ? INSTALL_FNAME : NULL;
PostInstall = isfile(POST_INSTALL_FNAME) ? POST_INSTALL_FNAME : NULL;
DeInstall = isfile(DEINSTALL_FNAME) ? DEINSTALL_FNAME : NULL;
PostDeInstall = isfile(POST_DEINSTALL_FNAME) ? POST_DEINSTALL_FNAME : NULL;
Require = isfile(REQUIRE_FNAME) ? REQUIRE_FNAME : NULL;
Display = isfile(DISPLAY_FNAME) ? DISPLAY_FNAME : NULL;
Mtree =isfile(MTREE_FNAME) ? MTREE_FNAME : NULL;
make_dist(homedir, pkg, suf, &plist);
free_plist(&plist);