emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed install/update tests on pkgs with no files.

Browse Source
This commit is contained in:
Juan RP 2014-09-14 18:04:10 +02:00
parent 68bb09bc58
commit ac2c517bd7
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/package_register.c
View File

@ -86,13 +86,13 @@ xbps_register_pkg(struct xbps_handle *xhp, xbps_dictionary_t pkgrd)
goto out; goto out;
} }
/* /*
* Create a hash for the pkg's metafile. * Create a hash for the pkg's metafile if it exists.
*/ */
buf = xbps_xasprintf("%s/.%s-files.plist", xhp->metadir, pkgname); buf = xbps_xasprintf("%s/.%s-files.plist", xhp->metadir, pkgname);
sha256 = xbps_file_hash(buf); if ((sha256 = xbps_file_hash(buf))) {
assert(sha256);
xbps_dictionary_set_cstring(pkgd, "metafile-sha256", sha256); xbps_dictionary_set_cstring(pkgd, "metafile-sha256", sha256);
free(sha256); free(sha256);
}
free(buf); free(buf);
/* /*
* Remove unneeded objs from pkg dictionary. * Remove unneeded objs from pkg dictionary.

34
lib/package_unpack.c
View File

@ -238,16 +238,6 @@ unpack_archive(struct xbps_handle *xhp,
xbps_dictionary_set(pkg_repod, "remove-script", data); xbps_dictionary_set(pkg_repod, "remove-script", data);
xbps_object_release(data); xbps_object_release(data);
} }
buf = xbps_xasprintf("%s/.%s-files.plist", xhp->metadir, pkgname);
if (!xbps_dictionary_externalize_to_file(binpkg_filesd, buf)) {
free(buf);
rv = errno;
xbps_set_cb_state(xhp, XBPS_STATE_UNPACK_FAIL, rv, pkgver,
"%s: [unpack] failed to externalize pkg metadata files: %s",
pkgver, strerror(rv));
goto out;
}
free(buf);
/* /*
* Execute INSTALL "pre" ACTION before unpacking files. * Execute INSTALL "pre" ACTION before unpacking files.
*/ */
@ -503,6 +493,21 @@ unpack_archive(struct xbps_handle *xhp,
pkgver, archive_error_string(ar)); pkgver, archive_error_string(ar));
goto out; goto out;
} }
/*
* Externalize binpkg files.plist to disk, if not empty.
*/
if (xbps_dictionary_count(binpkg_filesd)) {
buf = xbps_xasprintf("%s/.%s-files.plist", xhp->metadir, pkgname);
if (!xbps_dictionary_externalize_to_file(binpkg_filesd, buf)) {
rv = errno;
free(buf);
xbps_set_cb_state(xhp, XBPS_STATE_UNPACK_FAIL,
rv, pkgver, "%s: [unpack] failed to externalize pkg "
"pkg metadata files: %s", pkgver, strerror(rv));
goto out;
}
free(buf);
}
/* /*
* Skip checking for obsolete files on: * Skip checking for obsolete files on:
* - Package with "preserve" keyword. * - Package with "preserve" keyword.
@ -538,7 +543,14 @@ unpack_archive(struct xbps_handle *xhp,
xbps_object_release(obj); xbps_object_release(obj);
} }
xbps_object_release(pkg_filesd); xbps_object_release(pkg_filesd);
/*
* If unpacked pkg has no files, remove its files metadata plist.
*/
if (!xbps_dictionary_count(binpkg_filesd)) {
buf = xbps_xasprintf("%s/.%s-files.plist", xhp->metadir, pkgname);
unlink(buf);
free(buf);
}
out: out:
if (xbps_object_type(binpkg_filesd) == XBPS_TYPE_DICTIONARY) if (xbps_object_type(binpkg_filesd) == XBPS_TYPE_DICTIONARY)
xbps_object_release(binpkg_filesd); xbps_object_release(binpkg_filesd);