teldra/vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify check_installed_pkg to avoid calling xbps-pkgdb unnecessarily.

Browse Source 
--HG--
extra : convert_revision : 6e0f6f96a65b346e2e2e3c3253e5469d5eed8ede
This commit is contained in:
Juan RP 2008-10-29 22:05:29 +01:00
parent 3c6daaa6e3
commit c467d31a66
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
utils/xbps-pkgdb.c
View File

@ -193,11 +193,8 @@ main(int argc, char **argv)
exit(1);
}
obj = prop_dictionary_get(dbdict, argv[2]);
if (obj == NULL) {
printf("=> ERROR: package `%s' not registered in database.\n",
argv[2]);
if (obj == NULL)
exit(1);
}
printf("%s\n", prop_string_cstring_nocopy(obj));
} else {

14
xbps.sh
View File

@ -1164,16 +1164,10 @@ check_installed_pkg()
run_file $XBPS_TEMPLATESDIR/${pkg%-[0-9]*.*}.tmpl
fi
$XBPS_PKGDB_CMD installed $pkgname
if [ $? -eq 0 ]; then
#
# Package is installed, let's check the version.
#
iver="$($XBPS_PKGDB_CMD version $pkgname)"
if [ -n "$iver" ]; then
$XBPS_CMPVER_CMD $pkgname-$iver $pkgname-$reqver
[ $? -eq 0 ] && return 0
fi
iver="$($XBPS_PKGDB_CMD version $pkgname)"
if [ -n "$iver" ]; then
$XBPS_CMPVER_CMD $pkgname-$iver $pkgname-$reqver
[ $? -eq 0 ] && return 0
fi
return 1