moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

xbps-src: improve XBPS_PREFER_BINPKG_DEPS code.

Browse source
This commit is contained in:
Juan RP 2011-06-22 12:33:18 +02:00
parent bcbfb0c63c
commit a461919eea
1 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
xbps-src/shutils/chroot.sh.in
View file

@ -183,23 +183,17 @@ create_binsh_symlink()
prepare_binpkg_repos() prepare_binpkg_repos()
{ {
local repo local repo xver
if [ ! -f "$XBPS_MASTERDIR/.xbps_added_local_repo" ]; then # Check for xbps utils >= 0.9.0.
if [ ! -f ${XBPS_PACKAGESDIR}/${xbps_machine}/pkg-index.plist ]; then xver=$($XBPS_PKGDB_CMD -V|awk '{print $2}')
:
else
msg_normal "Registering local repository...\n"
${chroot_cmd} $XBPS_MASTERDIR \
${XBPS_REPO_CMD} add /xbps_packagesdir 2>/dev/null
[ $? -eq 0 ] && touch -f \
$XBPS_MASTERDIR/.xbps_added_local_repo
fi
fi
for repo in ${XBPS_REPO_LIST}; do for repo in ${XBPS_REPO_LIST}; do
${chroot_cmd} ${XBPS_MASTERDIR} ${XBPS_REPO_CMD} \ if [ -z "$xver" -o "$xver" = "" ]; then
add ${repo} 2>/dev/null ${chroot_cmd} ${XBPS_MASTERDIR} ${XBPS_REPO_CMD} \
[ $? -ne 0 ] && msg_warn "Failed to sync pkg-index from ${repo}\n" add ${repo} 2>/dev/null
[ $? -ne 0 ] && \
msg_warn "Failed to sync pkg-index from ${repo}\n"
fi
done done
} }