- Pacman-dev - lists.archlinux.org

[pacman-dev] makepkg FS#6708 patch
by Scott Horowitz 27 Mar '07

27 Mar '07

As per FS#6708, here is a patch against makepkg to download the first 50kb of the db.tar.gz file. Feel free to tweak the number, I thought it was a good balance between getting an accurate number and making dialup users wait. --- /usr/bin/rankmirrors 2007-03-25 20:07:04.000000000 -0600 +++ rankmirrors 2007-03-26 22:39:23.000000000 -0600 @@ -55,7 +55,8 @@ def talkToServer(serverUrl): opener = urllib2.build_opener() - tmp = opener.open(serverUrl).read() + # retrieve first 50,000 bytes only + tmp = opener.open(serverUrl).read(50000) def getFuncToTime(serverUrl): return lambda : talkToServer(serverUrl) @@ -139,8 +140,18 @@ elif options.times: print ' * ', sys.stdout.flush() + + # add db.tar.gz to server name + try: + splitted2 = serverUrl.split('/') + dbFileName = splitted2[len(splitted2) - 3] + '.db.tar.gz' + if serverUrl[-1] != '/': + dbFileName = '/' + dbFileName + except: + dbFileName = '' + try: - serverToTime[serverUrl] = timeCmd(getFuncToTime(serverUrl)) + serverToTime[serverUrl] = timeCmd(getFuncToTime(serverUrl + dbFileName)) if options.verbose: try: print "%.2f" % serverToTime[serverUrl]

1 2

[pacman-dev] Russian translation update.
by Владимир Байраковский 26 Mar '07

26 Mar '07

Hi! This is a new patch for src/pacman/po/ru_RU.po Now it looks like finished translation. But improvements are welcome. Thanks a lot, shild <sxp(a)bk.ru>!

2 1

[pacman-dev] CVS update of pacman-lib (NEWS src/pacman/po/ru_RU.po src/pacman/sync.c)
by Dan McGee 26 Mar '07

26 Mar '07

Date: Monday, March 26, 2007 @ 18:47:57 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: NEWS (1.11 -> 1.12) src/pacman/po/ru_RU.po (1.6 -> 1.7) src/pacman/sync.c (1.117 -> 1.118) * Fix NEWS typo. Oops. * Updated Russian translation. Владимир Байраковский <4rayven(a)gmail.com> and Shild <sxp(a)bk.ru> * Removed a string from gettext that didn't need it. ------------------------+ NEWS | 2 - src/pacman/po/ru_RU.po | 54 ++++++++++++++++++++++++----------------------- src/pacman/sync.c | 2 - 3 files changed, 30 insertions(+), 28 deletions(-) Index: pacman-lib/NEWS diff -u pacman-lib/NEWS:1.11 pacman-lib/NEWS:1.12 --- pacman-lib/NEWS:1.11 Thu Mar 22 11:18:26 2007 +++ pacman-lib/NEWS Mon Mar 26 18:47:56 2007 @@ -47,7 +47,7 @@ - repo-add - adds a package to a repo database file - repo-remove - removes a package from a repo database file - added pactest testing suite - - MANY fixes and small inprovements everywhere + - MANY fixes and small improvements everywhere 2.9.8 - Changed behaviour with original=X,current=Y,new=Z scenario - keep old in place, install new as .pacnew - Search package provides when finding matching targets with -S Index: pacman-lib/src/pacman/po/ru_RU.po diff -u pacman-lib/src/pacman/po/ru_RU.po:1.6 pacman-lib/src/pacman/po/ru_RU.po:1.7 --- pacman-lib/src/pacman/po/ru_RU.po:1.6 Sat Mar 24 00:18:19 2007 +++ pacman-lib/src/pacman/po/ru_RU.po Mon Mar 26 18:47:57 2007 @@ -1,5 +1,5 @@ # Pacman Russian Translation -# Copyright (C) YEAR Judd Vinet <jvinet(a)zeroflux.org> +# Copyright (C) 2007 Judd Vinet <jvinet(a)zeroflux.org> # This file is distributed under the same license as the Pacman package. # Vladimir Bayrakovskiy <4rayven(a)gmail.com>, 2007 # @@ -7,12 +7,15 @@ msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" -"POT-Creation-Date: 2007-03-23 20:46-0500\n" +"POT-Creation-Date: 2007-03-25 17:41+0600\n" "PO-Revision-Date: 2007-03-07 11:45-0500\n" "Last-Translator: Vladimir Bayrakovskiy <4rayven(a)gmail.com>\n" +"Language-Team: Russian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: src/pacman/add.c:72 src/pacman/remove.c:82 src/pacman/sync.c:482 #: src/pacman/sync.c:531 @@ -31,7 +34,7 @@ #: src/pacman/add.c:83 #, c-format msgid "failed to add target '%s' (%s)" -msgstr "" +msgstr "не удалось добавить цель '%s' (%s)" #: src/pacman/add.c:88 src/pacman/sync.c:196 src/pacman/trans.c:73 #: src/pacman/trans.c:80 src/pacman/trans.c:91 src/pacman/trans.c:105 @@ -115,11 +118,11 @@ #: src/pacman/log.c:194 msgid "Y" -msgstr "" +msgstr "Y" #: src/pacman/log.c:194 msgid "YES" -msgstr "" +msgstr "YES" #: src/pacman/log.h:30 msgid "error: " @@ -230,11 +233,11 @@ #: src/pacman/package.c:96 msgid "Yes" -msgstr "" +msgstr "Yes" #: src/pacman/package.c:96 msgid "No" -msgstr "" +msgstr "No" #: src/pacman/package.c:126 #, c-format @@ -303,7 +306,7 @@ #: src/pacman/pacman.c:91 #, c-format msgid " %s {-V --version}\n" -msgstr "" +msgstr " %s {-V --version}\n" #: src/pacman/pacman.c:92 #, c-format @@ -454,7 +457,7 @@ msgid "" " -m, --foreign list installed packages not found in sync db(s)\n" msgstr "" -" -m, --foreign показать все пакеты не найденные в базе данных(s)\n" +" -m, --foreign показать все пакеты не найденные в базе(ах) данных\n" #: src/pacman/pacman.c:132 #, c-format @@ -465,7 +468,7 @@ #, c-format msgid " -p, --file <package> query a package file instead of the database\n" msgstr "" -" -p, --file <пакет> извлечь информацию из файла пакета <пакет>, а не из " +" -p, --file <пакет> извлечь информацию из файла пакета <пакет>, а не из " "базы данных\n" #: src/pacman/pacman.c:134 @@ -474,7 +477,7 @@ " -s, --search <regex> search locally-installed packages for matching " "strings\n" msgstr "" -" -s, --search <regex> искать указанную строку в локально установленных " +" -s, --search <regex> искать указанную строку в локально установленных " "пакетах\n" #: src/pacman/pacman.c:135 @@ -506,8 +509,7 @@ #: src/pacman/pacman.c:145 #, c-format msgid " -l, --list <repo> view a list of packages in a repo\n" -msgstr "" -" -l, --list <repo> показать список всех пакетов в репозитории repo\n" +msgstr " -l, --list <repo> показать все пакеты данного репозитория\n" #: src/pacman/pacman.c:146 #, c-format @@ -553,14 +555,14 @@ " --ignore <pkg> ignore a package upgrade (can be used more than " "once)\n" msgstr "" -" --ignore <pkg> игнорировать пакет при обновлении (может быть " +" --ignore <пакет> игнорировать пакет при обновлении (может быть " "использовано неоднократно)\n" #: src/pacman/pacman.c:153 #, c-format msgid " --config <path> set an alternate configuration file\n" msgstr "" -" --config <path> использовать альтернативный конфигурационный файл\n" +" --config <путь> использовать альтернативный конфигурационный файл\n" #: src/pacman/pacman.c:154 #, c-format @@ -572,7 +574,7 @@ msgid "" " --ask <number> pre-specify answers for questions (see manpage)\n" msgstr "" -" --ask <number> заранее подготовленные ответы на вопросы (смотрите " +" --ask <число> заранее подготовленные ответы на вопросы (смотрите " "man-страницу)\n" #: src/pacman/pacman.c:156 @@ -597,30 +599,30 @@ #, c-format msgid " -r, --root <path> set an alternate installation root\n" msgstr "" -" -r, --root <path> указать алтернативную корневую директорию для " +" -r, --root <путь> указать альтернативную корневую директорию для " "установки\n" #: src/pacman/pacman.c:160 #, c-format msgid " -b, --dbpath <path> set an alternate database location\n" msgstr "" -" -b, --dbpath <path> указать альтернативное расположение базы данных\n" +" -b, --dbpath <путь> указать альтернативное расположение базы данных\n" #: src/pacman/pacman.c:161 #, c-format msgid " --cachedir <dir> set an alternate package cache location\n" -msgstr "" -" --cachedir <директория> указать альтернативное расположение кэша\n" +msgstr " --cachedir <dir> указать альтернативное расположение кэша\n" #: src/pacman/pacman.c:174 #, c-format msgid " This program may be freely redistributed under\n" msgstr "" +" This program may be freely redistributed under\n" #: src/pacman/pacman.c:175 #, c-format msgid " the terms of the GNU General Public License\n" -msgstr "" +msgstr " the terms of the GNU General Public License\n" #: src/pacman/pacman.c:300 #, c-format @@ -648,7 +650,7 @@ #: src/pacman/pacman.c:436 msgid "warning: current locale is invalid; using default \"C\" locale" -msgstr "" +msgstr "warning: current locale is invalid; using default \"C\" locale" #: src/pacman/pacman.c:456 #, c-format @@ -692,12 +694,12 @@ #: src/pacman/query.c:100 msgid "cannot determine ownership of a directory" -msgstr "не удается определить владельца директории" +msgstr "не удалось определить владельца каталога" #: src/pacman/query.c:105 #, c-format msgid "cannot determine real path for '%s': %s" -msgstr "" +msgstr "не удалось определить настоящий путь для '%s': %s" #: src/pacman/query.c:119 #, c-format @@ -887,12 +889,12 @@ #: src/pacman/sync.c:537 #, c-format msgid "pacman: %s\n" -msgstr "" +msgstr "pacman: %s\n" #: src/pacman/sync.c:557 #, c-format msgid "'%s': %s\n" -msgstr "" +msgstr "'%s': %s\n" #: src/pacman/sync.c:572 msgid ":: Install whole content? [Y/n] " Index: pacman-lib/src/pacman/sync.c diff -u pacman-lib/src/pacman/sync.c:1.117 pacman-lib/src/pacman/sync.c:1.118 --- pacman-lib/src/pacman/sync.c:1.117 Mon Mar 19 00:23:45 2007 +++ pacman-lib/src/pacman/sync.c Mon Mar 26 18:47:56 2007 @@ -554,7 +554,7 @@ continue; } if(pm_errno != PM_ERR_PKG_NOT_FOUND) { - ERR(NL, _("'%s': %s\n"), (char *)i->data, alpm_strerror(pm_errno)); + ERR(NL, "'%s': %s\n", (char *)i->data, alpm_strerror(pm_errno)); retval = 1; goto cleanup; }

1 0

[pacman-dev] CVS update of pacman-lib (NEWS)
by Dan McGee 26 Mar '07

26 Mar '07

Date: Thursday, March 22, 2007 @ 11:18:26 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: NEWS (1.10 -> 1.11) Roman Kyrylych <roman.kyrylych(a)gmail.com> * Updates to news file. ------+ NEWS | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) Index: pacman-lib/NEWS diff -u pacman-lib/NEWS:1.10 pacman-lib/NEWS:1.11 --- pacman-lib/NEWS:1.10 Tue Mar 20 01:47:11 2007 +++ pacman-lib/NEWS Thu Mar 22 11:18:26 2007 @@ -1,40 +1,53 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- 3.0.0 - first release based on libalpm backend - - added internationalization (gettext) support - - prompt to delete corrupted packages + - added internationalization (gettext) support: + - de, fr, hu, it, pt_BR, en_GB, ru_RU translations + - switch to usage of libdownload and libarchive + - improved proxy support using libdownload - documentation - man pages updated, new conf manpages added + - repository mirror list updates - added support for package changelogs - logging of all install scriptlet messages to pacman.log - - repository mirror list updates - orphans search (-Qe) now shows true orphans - - new -Qu option- show all packages that can be upgraded + - new -Qu option - show all packages that can be upgraded + - new -Se option - install only dependencies - dependency sorting on install and removal - - improved backup handling- backup array is proactive on upgrade - - new uncompressed size field, shown on sync upgrade - check for free space before installing packages + - prompt to delete corrupted packages + - improved backup handling - backup array proactive on upgrade + - removed NoUpgrade lines from default pacman.conf + - new uncompressed size field, shown on sync upgrade - improved progress and progressbar output - reduced unnecessary calling of ldconfig - selective loading of database to speed up certain operations - - switch to usage of libdownload and libarchive - - improved proxy support as a result of switch to libdownload - debugging output improved with --debug flag - - added 'rankmirrors' - script to show best available mirrors - - added 'repo-add' - the backbone script for building repos - - added pactest testing suite - - abs - supports cvsup/csup, expanded configuration - - abs - supports fetching of testing repository - - makepkg fixes: + - pacman-optimize - now supports DBs on separate filesystem + - makepkg and abs now support conf files in home directory + - makepkg changes: + - arch field is required + - added -arch suffix to generated package filenames - new configuration file options format + - changed default configuration - support alternate integrity checks - extract files using filetype, not extension - added noextract array + - new options array format - new option to log build process - - new repackage option - repackage pkg/ w/o building + - new --repackage option - repackage pkg/ without building - user-selectable paths for doc stripping - configurable source cache location - dependencies now removed on a build success or failure - - pacman-optimize - support DB's on separate filesystem + - abs changes: + - supports both cvsup and csup + - expanded configuration + - added support for testing repository + - new helper scripts: + - rankmirrors - shows best available mirrors + - repo-add - adds a package to a repo database file + - repo-remove - removes a package from a repo database file + - added pactest testing suite + - MANY fixes and small inprovements everywhere 2.9.8 - Changed behaviour with original=X,current=Y,new=Z scenario - keep old in place, install new as .pacnew - Search package provides when finding matching targets with -S

3 2

Re: [pacman-dev] pacman/xdelta using XferCommand
by Dale Ogilvie 26 Mar '07

26 Mar '07

> I agree; the XferCommand solution seems like an excellent way to > prototype this and see if it is feasible. As Aaron and I have alluded > to, we aren't real big on getting this done ourselves, but we will > offer suggestions if asked. Great. I'm asking for suggestions! I have verified that my makepkg patch works to create deltas of old versions placed by the packager in the build directory. The attached patch is for 2.9.8, as this is what I'm running on my system today. 3.0 just adds some $CARCH stuff, no big deal. I have verified that the download and patch from my own custom repo works using my custom XferCommand script. See attached. Where to from here? Some have suggested using another method rather than xdelta 1.1, bdiff/zsync/xdelta3 etc. I gave zsync a try but had to give up when it failed to download the files from my tomcat web server. Possibly it would work with apache, but it wasn't a good sign. I feel that there are quite a few more moving parts to the zsync solution which weigh against it. bdiff is reportedly a better xdelta - I personally think xdelta will do until proven otherwise. Dale

1 0

[pacman-dev] makepkg3 suggestions/thoughts
by Andrew Fyfe 26 Mar '07

26 Mar '07

* Remove the '--usesudo | -S' option. Instead always use sudo to calling pacman when an unprivileged user runs makepkg and spit out a warning (or error) if sudo is missing. Is sudo part of the base Arch Linux system? * Move common functions to a seperate file. plain, msg*, error, warning, in_array, check_* This has been brought up a few times, the last time it was suggested that the file should go in /usr/lib/archlinux/functions. (I think that was it). I'll make a patch if that's where they're going to go. Alternatively an autoconf option could be added to set the folder when pacman is built. * Move --cleancache into it's own script. (Or remove altogether) It's alot of code for 'rm $SRCDEST/*'. Do people use it? * Move BUILDSCRIPT="PKGBUILD" and PKGEXT="pkg.tar.gz" into makepkg.conf. They're used in a few scripts. * sha256 sha3.. sha512 WTFs wrong with md5 and sha1? Do we REALLY need these? If they must remain I demand the inclusion of CRC :p * Remove '--nocolor | -m' option. If you don't like colour switch it off in makepkg.conf :p Is it used? Andrew

2 1

[pacman-dev] pacman/xdelta using XferCommand
by Dale Ogilvie 26 Mar '07

26 Mar '07

Hello, see my post on the forum (http://bbs.archlinux.org/viewtopic.php?pid=238317#p238317) Any chance that this "low-engineering" approach to implementing an xdelta solution could fly for arch, at least in the short term? This solution involves: 1. modified makepkg (see http://bbs.archlinux.org/viewtopic.php?pid=235654#p235654) 2. packagers having pkgver-1 in the makepkg build dir to create the delta 3. end-user implementing XferCommand with a custom xdelta aware script If this works well for some users, a full c-code solution in pacman could be rolled out further down the track. Thoughts? I see that archlinux.org and the mirrors have been experiencing some "bandwidth" issues after the python 2.5 release that perhaps underline the need for something like this in arch. Dale

2 1

[pacman-dev] new script: repo-local-cleaner
by Alessio 'mOLOk' Bolognino 25 Mar '07

25 Mar '07

Hi list, this is a script I wrote for myself, but Roman suggested me to send it here, so... here it is: it's a script that removes old packages in the local repo and optionally runs gensync at the end. I tried to follow the standards of makepkg, feel free to ignore it, change it, change its name and things like that. You can even change the copyright line and put Judd's name if you want. ---------------8<----------------8<-----------------8<-------------8< #!/bin/bash # repo-local-cleaner : delete old packages in local repo # # Copyright (c) 2007 Alessio 'mOLOk' Bolognino <themolok(a)gmail.com> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, # USA. myver='3.0.0' source /etc/makepkg.conf # for $CARCH and $USE_COLOR # default settings: PKGEXT="pkg.tar.gz" LOCAL_REPO_DIR="/home/custompkgs" LOCAL_SRCROOT="/var/abs/local" LOCAL_REPO_NAME="custom" RUN_GENSYNC="n" if [ -r /etc/repo-local-cleaner.conf ]; then source /etc/repo-local-cleaner.conf fi msg() { if [ ! "$USE_COLOR" = "n" ]; then echo -e "\033[1;32m==>\033[1;0m \033[1;1m$1\033[1;0m" >&2 else echo "==> $1" >&2 fi } error() { if [ ! "$USE_COLOR" = "n" ]; then echo -e "\033[1;31m==> ERROR:\033[1;0m \033[1;1m$1\033[1;0m" >&2 else echo "==> ERROR: $1" >&2 fi } usage() { echo "repo-local-clener $myver" echo echo "usage: repo-local-cleaner" echo echo "repo-local-clener will delete old packages from the local repository." echo "If setted in the configuration file, it can run gensync." echo "It takes no options." echo } if [ $# -ne 0 -o "$1" = "-h" -o "$1" = "--help" ]; then usage exit 0 fi cd $LOCAL_REPO_DIR count_rm=0 count_all=0 mkdir -p XXX/ for pack in $(ls -v *-${CARCH}.${PKGEXT}) ; do pkgname=${pack%-*-*-${CARCH}.${PKGEXT}} if [ "$p_pkgname" = "$pkgname" ]; then mv ${p_pack} XXX/${p_pack} let count_rm++ fi let count_all++ p_pack=${pack} p_pkgname=${pkgname} done size_removed=$(ls -sh1 XXX/ | awk '{ print $2 }' | head -1) msg "Checking for old packages..." if [ $count_rm = 0 ]; then msg "No package removed" else msg "Removed $count_rm/$count_all old package(s) ( - ${size_removed} )" fi rm -fr XXX/ if [ ! "$RUN_GENSYNC" = "n" ]; then msg "Running gensync..." gensync $LOCAL_SRCROOT $LOCAL_REPO_DIR/$LOCAL_REPO_NAME.db.tar.gz $LOCAL_REPO_DIR/ if [ $? = 0 ]; then msg "done!" else error "gensync failed :(" fi fi # vim: set ts=2 sw=2 noet: ---------------8<----------------8<-----------------8<-------------8< Cheers, -- Alessio 'mOLOk' Bolognino Arch Linux Trusted User http://www.archlinux.org

2 2

[pacman-dev] question
by fancris3 25 Mar '07

25 Mar '07

Pacman from today cvs. pacman -Suv Root : / DBPath : var/lib/pacman/ CacheDir : var/cache/pacman/pkg/ Targets : None :: Starting full system upgrade... warning: rar-3.7.b1-1: ignoring package upgrade (to be replaced by unrar-3.7.3-1) warning: bmpx: local (0.36.1-1) is newer than extra (0.34.7-1) warning: krusader: local (1.80.0-beta1) is newer than extra (1.70.1-1) warning: pacman: local (3.0.0-1) is newer than current (2.9.8-4) warning: pinot: local (0.65-1) is newer than community (0.49-1) warning: xapian-core: local (0.9.9-1) is newer than community (0.9.6-1) warning: xaralx: local (0.7r1766-2) is newer than unstable (0.7r1764-2) resolving dependencies... done. error: failed to prepare transaction (could not satisfy dependencies) :: opera-devel requires qt :: arts requires qt :: kdelibs requires qt>=3.3.7 I think missing the answer.Something like: :: failed to upgrade qt-enhanced-3.3.8-3 to qt-enhanced-3.3.8-4 I have qt-enhanced and kde from arch repository and now qt-enhanced-3.3.8-4 seem to no provide qt. Thanks

3 5

[pacman-dev] CVS update of pacman-lib (3 files)
by Dan McGee 25 Mar '07

25 Mar '07

Date: Sunday, March 25, 2007 @ 13:37:43 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: etc/pacman.d/.cvsignore (1.1 -> 1.2) pactest/tests/scriptlet001.py (1.1 -> 1.2) scripts/makepkg (1.64 -> 1.65) * Fix bug where 'makepkg -L' doesn't stop on build failure. Andrew Fyfe <andrew(a)neptune-one.net> * Add testing to etc/pacman.d/.cvsignore * Fix scriptlet001.py test to work during 'make check'. -------------------------------+ etc/pacman.d/.cvsignore | 1 + pactest/tests/scriptlet001.py | 3 ++- scripts/makepkg | 21 ++++++++------------- 3 files changed, 11 insertions(+), 14 deletions(-) Index: pacman-lib/etc/pacman.d/.cvsignore diff -u pacman-lib/etc/pacman.d/.cvsignore:1.1 pacman-lib/etc/pacman.d/.cvsignore:1.2 --- pacman-lib/etc/pacman.d/.cvsignore:1.1 Tue Jan 16 22:40:09 2007 +++ pacman-lib/etc/pacman.d/.cvsignore Sun Mar 25 13:37:42 2007 @@ -6,3 +6,4 @@ mirrorlist release unstable +testing Index: pacman-lib/pactest/tests/scriptlet001.py diff -u pacman-lib/pactest/tests/scriptlet001.py:1.1 pacman-lib/pactest/tests/scriptlet001.py:1.2 --- pacman-lib/pactest/tests/scriptlet001.py:1.1 Thu Mar 22 04:30:18 2007 +++ pacman-lib/pactest/tests/scriptlet001.py Sun Mar 25 13:37:43 2007 @@ -8,7 +8,8 @@ p1.install['post_install'] = "ls /etc"; self.addpkg(p1) -self.args = "-U %s" % p1.filename() +# --debug is necessary to check PACMAN_OUTPUT +self.args = "--debug -U %s" % p1.filename() self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_OUTPUT=pre_install") Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.64 pacman-lib/scripts/makepkg:1.65 --- pacman-lib/scripts/makepkg:1.64 Sat Mar 24 13:11:18 2007 +++ pacman-lib/scripts/makepkg Sun Mar 25 13:37:43 2007 @@ -883,6 +883,7 @@ echo $SHELLOPTS | grep errexit 2>&1 >/dev/null set_e=$? + ret=0 if [ "$LOGGING" = "1" ]; then BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log" if [ -f "$BUILDLOG" ]; then @@ -899,24 +900,18 @@ #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 - error "Build Failed. Aborting..." - removedeps - exit 2 - fi else #use 'errexit' to bail on syntax error [ $set_e -eq 1 ] && set -e - build 2>&1 + build 2>&1 || ret=$? [ $set_e -eq 1 ] && set +e - if [ $? -gt 0 ]; then - error "Build Failed. Aborting..." - removedeps - exit 2 - fi + fi + if [ $ret -gt 0 ]; then + error "Build Failed. Aborting..." + removedeps + exit 2 fi fi

1 0