Aaron Griffin wrote:
On 3/26/07, Gustavo Chain <g@vtr.net> wrote:
Hi all!
Dont' you think that makepkg should use ProxySettings from pacman.conf. ?
What dou you think about ?
makepkg uses wget, which should (last I checked) honor the typical "http_proxy" and "ftp_proxy" environment variables.
_______________________________________________ pacman-dev mailing list pacman-dev@archlinux.org http://www.archlinux.org/mailman/listinfo/pacman-dev
Here's a modified version of Gustavo Chain's patch, it moves the loading of the proxy settings outside of the for loop (so it doesn't load for every file in the source array), and a modified command to get the ProxyServer setting. Andrew ------------------------------------------------------------ revno: 3 committer: Andrew Fyfe <andrew@neptune-one.net> branch nick: bug_log_pipe timestamp: Sun 2007-03-25 16:39:45 +0100 message: * Fix bug where 'makepkg -L' doesn't stop on build failure. To test... PKGBUILD>> pkgname=test-package pkgver=1 pkgrel=1 arch=(i686) build() { false; } run makepkg -L build() will fail and makepkg carries on trying to create the package. === modified file 'scripts/makepkg' --- old/scripts/makepkg 2007-03-24 03:49:27 +0000 +++ new/scripts/makepkg 2007-03-25 15:39:45 +0000 @@ -899,10 +899,10 @@ #use 'errexit' to bail on syntax error [ $set_e -eq 1 ] && set -e - build 2>&1 | tee "$BUILDLOG" + build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]} [ $set_e -eq 1 ] && set +e - if [ ${PIPESTATUS[0]} -gt 0 ]; then + if [ $ret -gt 0 ]; then error "Build Failed. Aborting..." removedeps exit 2