Forward port 3.0.2 branch fixes

Fix #6905- makepkg dependency checking error
Fix #6915- add SUU mirror to mirrorlist.in

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2007-04-16 21:51:18 -04:00
parent 14606c301c
commit 8bd0f3921f
3 changed files with 3 additions and 3 deletions

View File

@ -5,6 +5,7 @@
# United States
Server = ftp://ftp.archlinux.org/@@REPO@@/os/@CARCH@
Server = ftp://ftp.nethat.com/pub/linux/archlinux/@@REPO@@/os/@CARCH@
Server = ftp://locke.suu.edu/linux/dist/archlinux/@@REPO@@/os/@CARCH@
Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/@@REPO@@/os/@CARCH@
Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/@@REPO@@/os/@CARCH@
Server = http://mirrors.easynews.com/linux/archlinux/@@REPO@@/os/@CARCH@

View File

@ -228,8 +228,7 @@ checkdeps() {
pmout=$(pacman $PACMAN_OPTS -T $*)
ret=$?
if [ $ret -eq 1 ]; then #unresolved deps
#strip out the pacman prefix from "requires: xyz"
echo $pmout | sed 's|requires:||g'
echo "$pmout"
elif [ $ret -ne 0 ]; then
error "$(eval_gettext "pacman returned a fatal error (\$ret): \$pmout")"
exit 1

View File

@ -81,7 +81,7 @@ int pacman_deptest(alpm_list_t *targets)
}
if(!found) {
MSG(NL, _("requires: %s"), saved_target);
MSG(NL, "%s", saved_target);
retval = 1;
}
free(saved_target);