[pacman-dev] CVS update of pacman-lib (3 files)
Thomas S Hatch
thatch45 at gmail.com
Mon Apr 16 22:07:42 EDT 2007
Thanks for adding us (suu.edu) Dan!
On 4/16/07, Dan McGee <dan at archlinux.org> wrote:
>
> Date: Monday, April 16, 2007 @ 21:49:06
> Author: dan
> Path: /home/cvs-pacman/pacman-lib
>
> Modified: etc/pacman.d/mirrorlist.in (1.9 -> 1.10)
> scripts/makepkg (1.68 -> 1.69) src/pacman/deptest.c (1.19 ->
> 1.20)
>
> Bugfixes in prep for a 3.0.2 release
>
> Fix #6905- makepkg dependency checking error
> Fix #6915- add SUU mirror to mirrorlist.in
>
>
> ----------------------------+
> etc/pacman.d/mirrorlist.in | 1 +
> scripts/makepkg | 3 +--
> src/pacman/deptest.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
>
> Index: pacman-lib/etc/pacman.d/mirrorlist.in
> diff -u pacman-lib/etc/pacman.d/mirrorlist.in:1.9pacman-lib/etc/pacman.d/mirrorlist.in:
> 1.10
> --- pacman-lib/etc/pacman.d/mirrorlist.in:1.9 Mon Apr 9 16:13:31 2007
> +++ pacman-lib/etc/pacman.d/mirrorlist.in Mon Apr 16 21:49:06 2007
> @@ -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@
> Index: pacman-lib/scripts/makepkg
> diff -u pacman-lib/scripts/makepkg:1.68 pacman-lib/scripts/makepkg:1.69
> --- pacman-lib/scripts/makepkg:1.68 Wed Apr 11 12:41:29 2007
> +++ pacman-lib/scripts/makepkg Mon Apr 16 21:49:06 2007
> @@ -182,8 +182,7 @@
> 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
> Index: pacman-lib/src/pacman/deptest.c
> diff -u pacman-lib/src/pacman/deptest.c:1.19pacman-lib/src/pacman/deptest.c:
> 1.20
> --- pacman-lib/src/pacman/deptest.c:1.19 Fri Mar 9 00:33:06 2007
> +++ pacman-lib/src/pacman/deptest.c Mon Apr 16 21:49:06 2007
> @@ -81,7 +81,7 @@
> }
>
> if(!found) {
> - MSG(NL, _("requires: %s"), saved_target);
> + MSG(NL, "%s", saved_target);
> retval = 1;
> }
> free(saved_target);
>
> _______________________________________________
> pacman-dev mailing list
> pacman-dev at archlinux.org
> http://archlinux.org/mailman/listinfo/pacman-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://archlinux.org/pipermail/pacman-dev/attachments/20070416/53868aa5/attachment.htm>
More information about the pacman-dev
mailing list