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

Improved callback/states support to make libxbps std{err,out} printf free.

Browse Source 
This is a major API/ABI change, documentation has been updated accordingly.
This commit is contained in:
Juan RP
2011-11-24 11:23:08 +01:00
parent 4ed6b5ed2c
commit 3ccfec7054
29 changed files with 910 additions and 726 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
bin/xbps-bin/remove.c
View File

@@ -38,24 +38,12 @@ pkg_remove_and_purge(const char *pkgname, const char *version, bool purge)
{
int rv = 0;
printf("Removing package %s-%s ...\n", pkgname, version);
if ((rv = xbps_remove_pkg(pkgname, version, false)) != 0) {
xbps_error_printf("xbps-bin: unable to remove %s-%s (%s).\n",
pkgname, version, strerror(errno));
if ((rv = xbps_remove_pkg(pkgname, version, false)) != 0)
return rv;
}
if (purge) {
printf(" Purging ... ");
(void)fflush(stdout);
if ((rv = xbps_purge_pkg(pkgname, false)) != 0) {
xbps_error_printf("xbps-bin: unable to purge %s-%s "
"(%s).\n", pkgname, version,
strerror(errno));
if (purge)
if ((rv = xbps_purge_pkg(pkgname, false)) != 0)
return rv;
}
printf("done.\n");
}
return rv;
}
@@ -183,7 +171,7 @@ remove_installed_pkgs(int argc, char **argv, bool yes, bool purge,
continue;
}
xbps_printf("WARNING: %s IS REQUIRED BY %u PACKAGE%s:\n\n",
printf("WARNING: %s IS REQUIRED BY %u PACKAGE%s:\n\n",
pkgver, prop_array_count(reqby),
prop_array_count(reqby) > 1 ? "S" : "");
for (x = 0; x < prop_array_count(reqby); x++) {