summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-04-17 03:51:18 +0200
committerDan McGee <dan@archlinux.org>2007-04-17 03:51:18 +0200
commit8bd0f3921f42ba40413bf82da9bf0bee457a2a9b (patch)
tree316c75829b746eba428766dc09ddb98f62e5a5f5
parent14606c301cce168b042925726b19d5d7c5b725f6 (diff)
downloadpacman-8bd0f3921f42ba40413bf82da9bf0bee457a2a9b.tar.gz
pacman-8bd0f3921f42ba40413bf82da9bf0bee457a2a9b.tar.xz
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>
-rw-r--r--etc/pacman.d/mirrorlist.in1
-rwxr-xr-xscripts/makepkg.in3
-rw-r--r--src/pacman/deptest.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/etc/pacman.d/mirrorlist.in b/etc/pacman.d/mirrorlist.in
index c5c9aee4..f1c53a8e 100644
--- a/etc/pacman.d/mirrorlist.in
+++ b/etc/pacman.d/mirrorlist.in
@@ -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@
diff --git a/scripts/makepkg.in b/scripts/makepkg.in
index ba62a2db..7bfdf000 100755
--- a/scripts/makepkg.in
+++ b/scripts/makepkg.in
@@ -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
diff --git a/src/pacman/deptest.c b/src/pacman/deptest.c
index dc968f25..1ae7ceb5 100644
--- a/src/pacman/deptest.c
+++ b/src/pacman/deptest.c
@@ -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);