diff options
| author | Dan McGee <dan@archlinux.org> | 2007-04-17 03:49:06 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-04-17 03:49:06 +0200 |
| commit | ec83c93ea4a7d4742c5d92438b0da1c469704257 (patch) | |
| tree | f1b1cf1c30c09f57c3c6163d09c5927fefb49560 | |
| parent | 562887ba5cda60cb288f2c46fcb4b84339f50cb2 (diff) | |
| download | pacman-ec83c93ea4a7d4742c5d92438b0da1c469704257.tar.gz pacman-ec83c93ea4a7d4742c5d92438b0da1c469704257.tar.xz | |
Bugfixes in prep for a 3.0.2 release
Fix #6905- makepkg dependency checking error
Fix #6915- add SUU mirror to mirrorlist.in
| -rw-r--r-- | etc/pacman.d/mirrorlist.in | 1 | ||||
| -rwxr-xr-x | scripts/makepkg | 3 | ||||
| -rw-r--r-- | src/pacman/deptest.c | 2 |
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 b/scripts/makepkg index 9cfea69e..9e38a6dd 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -182,8 +182,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 "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); |