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

xbps_unpack_binary_pkg: remove redudant error printf, cosmetic changes.

Browse Source
This commit is contained in:
Juan RP
2011-07-29 23:28:36 +02:00
parent 6327100f1a
commit 890bdd368f
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/package_unpack.c
View File

@@ -438,7 +438,7 @@ xbps_unpack_binary_pkg(prop_dictionary_t pkg_repod)
{
struct xbps_handle *xhp;
struct archive *ar;
const char *pkgname, *version, *repoloc, *pkgver;
const char *pkgname, *version, *repoloc, *pkgver, *fname;
char *bpkg;
int rv = 0;
@@ -448,6 +448,7 @@ xbps_unpack_binary_pkg(prop_dictionary_t pkg_repod)
prop_dictionary_get_cstring_nocopy(pkg_repod, "version", &version);
prop_dictionary_get_cstring_nocopy(pkg_repod, "pkgver", &pkgver);
prop_dictionary_get_cstring_nocopy(pkg_repod, "repository", &repoloc);
prop_dictionary_get_cstring_nocopy(pkg_repod, "filename", &fname);
bpkg = xbps_path_from_repository_uri(pkg_repod, repoloc);
if (bpkg == NULL) {
@@ -469,7 +470,7 @@ xbps_unpack_binary_pkg(prop_dictionary_t pkg_repod)
if (archive_read_open_filename(ar, bpkg, ARCHIVE_READ_BLOCKSIZE) != 0) {
rv = archive_errno(ar);
xbps_error_printf("failed to open `%s' binpkg: %s\n",
bpkg, strerror(rv));
fname, strerror(rv));
goto out;
}
/*
@@ -492,11 +493,9 @@ xbps_unpack_binary_pkg(prop_dictionary_t pkg_repod)
/*
* Extract archive files.
*/
if ((rv = unpack_archive(pkg_repod, ar, pkgname, version, xhp)) != 0) {
xbps_error_printf("failed to unpack `%s' binpkg: %s\n",
bpkg, strerror(rv));
if ((rv = unpack_archive(pkg_repod, ar, pkgname, version, xhp)) != 0)
goto out;
}
/*
* Set package state to unpacked.
*/