Make some xbps_printf()s conditioned on XBPS_FLAG_VERBOSE.

This commit is contained in:
Juan RP 2011-01-29 01:55:52 +01:00
parent 463d182c49
commit 298305c1d5
2 changed files with 6 additions and 6 deletions

View File

@ -129,7 +129,7 @@ int
xbps_purge_pkg(const char *pkgname, bool check_state) xbps_purge_pkg(const char *pkgname, bool check_state)
{ {
prop_dictionary_t dict, pkgd; prop_dictionary_t dict, pkgd;
int rv = 0; int rv = 0, flags = xbps_get_flags();
pkg_state_t state = 0; pkg_state_t state = 0;
assert(pkgname != NULL); assert(pkgname != NULL);
@ -187,7 +187,8 @@ xbps_purge_pkg(const char *pkgname, bool check_state)
if ((rv = xbps_unregister_pkg(pkgname)) != 0) if ((rv = xbps_unregister_pkg(pkgname)) != 0)
goto out; goto out;
xbps_printf("Package %s purged successfully.\n", pkgname); if (flags & XBPS_FLAG_VERBOSE)
xbps_printf("Package %s purged successfully.\n", pkgname);
out: out:
xbps_regpkgdb_dictionary_release(); xbps_regpkgdb_dictionary_release();

View File

@ -79,13 +79,11 @@ xbps_remove_pkg_files(prop_dictionary_t dict, const char *key)
prop_object_t obj; prop_object_t obj;
const char *file, *sha256, *curobj = NULL; const char *file, *sha256, *curobj = NULL;
char *path = NULL; char *path = NULL;
int flags = 0, rv = 0; int flags = xbps_get_flags(), rv = 0;
assert(dict != NULL); assert(dict != NULL);
assert(key != NULL); assert(key != NULL);
flags = xbps_get_flags();
array = prop_dictionary_get(dict, key); array = prop_dictionary_get(dict, key);
if (array == NULL) if (array == NULL)
return EINVAL; return EINVAL;
@ -158,7 +156,8 @@ xbps_remove_pkg_files(prop_dictionary_t dict, const char *key)
} else { } else {
/* Success */ /* Success */
xbps_printf("Removed %s: `%s'\n", curobj, file); if (flags & XBPS_FLAG_VERBOSE)
xbps_printf("Removed %s: `%s'\n", curobj, file);
} }
free(path); free(path);
} }