A bit of reorganization in C/shell code.
With these changes: - Added 'sanitize-plist' action to xbps-pkgdb. It takes a plist file as argument and writes another one "sanitized" by proplib. Use it to sanitize the pkgindex plist file. - Split xbps-pkgdb functions to be shared by other files. - Split xbps-digest functions to be shared by other files. - Rename the plist file to register/unregister installed pkgs to regpkgdb.plist, and related stuff in shell scripts. --HG-- extra : convert_revision : 37731b04c6b41aebac629dfa06106175b9b5e59c
This commit is contained in:
parent
5f69948167
commit
48b2f033da
13 changed files with 835 additions and 587 deletions
|
@ -147,7 +147,7 @@ install_dependencies_pkg()
|
|||
msg_normal "Required minimal deps for $(basename $pkg):"
|
||||
for i in ${installed_deps_list}; do
|
||||
ipkg=${i%-[0-9]*.*}
|
||||
iversion="$($XBPS_PKGDB_CMD version $ipkg)"
|
||||
iversion="$($XBPS_REGPKGDB_CMD version $ipkg)"
|
||||
echo " $ipkg >= ${i##[aA-zZ]*-}: found $ipkg-$iversion."
|
||||
done
|
||||
|
||||
|
@ -198,14 +198,14 @@ check_installed_pkg()
|
|||
local reqver="$2"
|
||||
local iver=
|
||||
|
||||
[ -z "$pkg" -o -z "$reqver" -o ! -r $XBPS_PKGDB_FPATH ] && return 1
|
||||
[ -z "$pkg" -o -z "$reqver" -o ! -r $XBPS_REGPKGDB_PATH ] && return 1
|
||||
|
||||
if [ "$pkgname" != "${pkg%-[0-9]*.*}" ]; then
|
||||
reset_tmpl_vars
|
||||
. $XBPS_TEMPLATESDIR/${pkg%-[0-9]*.*}.tmpl
|
||||
fi
|
||||
|
||||
iver="$($XBPS_PKGDB_CMD version $pkgname)"
|
||||
iver="$($XBPS_REGPKGDB_CMD version $pkgname)"
|
||||
if [ -n "$iver" ]; then
|
||||
$XBPS_CMPVER_CMD $pkgname-$iver $pkgname-$reqver
|
||||
[ $? -eq 0 ] && return 0
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue