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

xbps-bin: check: don't play stupid games removing previous lines.

Browse Source
This commit is contained in:
Juan RP 2011-06-22 09:33:39 +02:00
parent de9e153bb9
commit 96bf160032
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bin/xbps-bin/check.c
View File

@ -74,7 +74,6 @@ xbps_check_pkg_integrity_all(void)
if ((rv = xbps_check_pkg_integrity(pkgname)) != 0) if ((rv = xbps_check_pkg_integrity(pkgname)) != 0)
nbrokenpkgs++; nbrokenpkgs++;
npkgs++; npkgs++;
printf("\033[1A\033[K");
} }
printf("%zu package%s processed: %zu broken.\n", npkgs, printf("%zu package%s processed: %zu broken.\n", npkgs,
npkgs == 1 ? "" : "s", nbrokenpkgs); npkgs == 1 ? "" : "s", nbrokenpkgs);
@ -159,9 +158,14 @@ xbps_check_pkg_integrity(const char *pkgname)
while ((obj = prop_object_iterator_next(iter))) { while ((obj = prop_object_iterator_next(iter))) {
if (!prop_dictionary_get_cstring_nocopy(obj, "target", &tgt)) if (!prop_dictionary_get_cstring_nocopy(obj, "target", &tgt))
continue; continue;
if (strcmp(tgt, "") == 0)
continue;
prop_dictionary_get_cstring_nocopy(obj, "file", &file); prop_dictionary_get_cstring_nocopy(obj, "file", &file);
if (strcmp(tgt, "") == 0) {
if (xhp->flags & XBPS_FLAG_VERBOSE)
fprintf(stderr, "%s: `%s' symlink with"
"empty target object!\n", pkgname,
file);
continue;
}
if (realpath(file, buf) == NULL) { if (realpath(file, buf) == NULL) {
prop_object_iterator_release(iter); prop_object_iterator_release(iter);
rv = errno; rv = errno;
@ -284,7 +288,8 @@ xbps_check_pkg_integrity(const char *pkgname)
} }
rv = xbps_check_is_installed_pkg_by_pattern(reqpkg); rv = xbps_check_is_installed_pkg_by_pattern(reqpkg);
if (rv <= 0) { if (rv <= 0) {
printf("%s: dependency not satisfied: %s\n", fprintf(stderr,
"%s: dependency not satisfied: %s\n",
pkgname, reqpkg); pkgname, reqpkg);
} }
rv = 0; rv = 0;