- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 2/2] s/removing (all|old)/Removing \1/
by Brendan Hide 31 Aug '09

31 Aug '09

More consistent capitalisation. Note that capitalisation for languages other than English have NOT been modified in any way as they would need to be done manually. Signed-off-by: Brendan Hide <brendan(a)swiftspirit.co.za> --- lib/libalpm/add.c | 2 +- po/cs.po | 4 ++-- po/de.po | 4 ++-- po/en_GB.po | 8 ++++---- po/es.po | 4 ++-- po/fr.po | 4 ++-- po/hu.po | 4 ++-- po/it.po | 4 ++-- po/pacman.pot | 4 ++-- po/pl.po | 4 ++-- po/pt_BR.po | 4 ++-- po/ru.po | 4 ++-- po/tr.po | 4 ++-- po/uk.po | 4 ++-- po/zh_CN.po | 4 ++-- src/pacman/sync.c | 4 ++-- 16 files changed, 33 insertions(+), 33 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 6eb2085..0931cd5 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -192,7 +192,7 @@ static int upgrade_remove(pmpkg_t *oldpkg, pmpkg_t *newpkg, pmtrans_t *trans, pm ALPM_LOG_FUNC; - _alpm_log(PM_LOG_DEBUG, "removing old package first (%s-%s)\n", + _alpm_log(PM_LOG_DEBUG, "Removing old package first (%s-%s)\n", oldpkg->name, oldpkg->version); if(!tr) { diff --git a/po/cs.po b/po/cs.po index cfbaf4c..a95bc11 100644 --- a/po/cs.po +++ b/po/cs.po @@ -719,7 +719,7 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "Chcete odstranit staré balíčky z cache?" #, c-format -msgid "removing old packages from cache... " +msgid "Removing old packages from cache... " msgstr "odstraňují se staré balíčky z cache... " #, c-format @@ -735,7 +735,7 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "Chcete odstranit VŠECHNY balíčky z cache?" #, c-format -msgid "removing all packages from cache... " +msgid "Removing all packages from cache... " msgstr "odstraňují se všechny balíčky z cache... " #, c-format diff --git a/po/de.po b/po/de.po index 5fdabdc..e78c3ae 100644 --- a/po/de.po +++ b/po/de.po @@ -748,7 +748,7 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "Möchten Sie veraltete Pakete aus dem Puffer entfernen?" #, c-format -msgid "removing old packages from cache... " +msgid "Removing old packages from cache... " msgstr "Entferne alte Pakete aus dem Puffer... " #, c-format @@ -764,7 +764,7 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "Möchten Sie ALLE Pakete aus dem Puffer entfernen? " #, c-format -msgid "removing all packages from cache... " +msgid "Removing all packages from cache... " msgstr "Entferne alle Pakete aus dem Puffer... " #, c-format diff --git a/po/en_GB.po b/po/en_GB.po index 74a74d9..af58c8d 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -714,8 +714,8 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "Do you want to remove outdated packages from cache?" #, c-format -msgid "removing old packages from cache... " -msgstr "removing old packages from cache... " +msgid "Removing old packages from cache... " +msgstr "Removing old packages from cache... " #, c-format msgid "could not access cache directory\n" @@ -730,8 +730,8 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "Do you want to remove ALL packages from cache?" #, c-format -msgid "removing all packages from cache... " -msgstr "removing all packages from cache... " +msgid "Removing all packages from cache... " +msgstr "Removing all packages from cache... " #, c-format msgid "could not remove cache directory\n" diff --git a/po/es.po b/po/es.po index aa3e7eb..d385b0f 100644 --- a/po/es.po +++ b/po/es.po @@ -767,7 +767,7 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "Desea borrar todos los paquetes desactualizados de la cache? " #, c-format -msgid "removing old packages from cache... " +msgid "Removing old packages from cache... " msgstr "quitando paquetes antiguos de la cache..." #, c-format @@ -783,7 +783,7 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "Desea quitar TODOS los paquetes de la cache?" #, c-format -msgid "removing all packages from cache... " +msgid "Removing all packages from cache... " msgstr "quitando todos los paquetes de la cache... " #, c-format diff --git a/po/fr.po b/po/fr.po index eb69b94..2d2d17d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -773,7 +773,7 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "Voulez-vous supprimer tous les paquets non installés du cache?" #, c-format -msgid "removing old packages from cache... " +msgid "Removing old packages from cache... " msgstr "Suppression du cache des paquets obsolètes... " #, c-format @@ -790,7 +790,7 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "Voulez vous supprimer TOUS les paquets du cache?" #, c-format -msgid "removing all packages from cache... " +msgid "Removing all packages from cache... " msgstr "Suppression du cache de tous les paquets... " #, c-format diff --git a/po/hu.po b/po/hu.po index 743f333..a9b18c3 100644 --- a/po/hu.po +++ b/po/hu.po @@ -723,7 +723,7 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "Törölni kívánja az elavult csomagokat a gyorsítótárból?" #, c-format -msgid "removing old packages from cache... " +msgid "Removing old packages from cache... " msgstr "a régi csomagok törlése a gyorsítótárból... " #, c-format @@ -739,7 +739,7 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "Törölni kívánja az ÖSSZES csomagot a gyorsítótárból?" #, c-format -msgid "removing all packages from cache... " +msgid "Removing all packages from cache... " msgstr "az összes csomag törlése a gyorsítótárból... " #, c-format diff --git a/po/it.po b/po/it.po index fd74bfb..5f0950d 100644 --- a/po/it.po +++ b/po/it.po @@ -734,7 +734,7 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "Vuoi rimuovere dalla cache i pacchetti non aggiornati?" #, c-format -msgid "removing old packages from cache... " +msgid "Removing old packages from cache... " msgstr "rimozione dei vecchi pacchetti dalla cache in corso... " #, c-format @@ -750,7 +750,7 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "Vuoi rimuovere dalla cache TUTTI i pacchetti?" #, c-format -msgid "removing all packages from cache... " +msgid "Removing all packages from cache... " msgstr "rimozione di tutti i pacchetti dalla cache in corso... " #, c-format diff --git a/po/pacman.pot b/po/pacman.pot index f4cc3e1..b6dbb3d 100644 --- a/po/pacman.pot +++ b/po/pacman.pot @@ -685,7 +685,7 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "" #, c-format -msgid "removing old packages from cache... " +msgid "Removing old packages from cache... " msgstr "" #, c-format @@ -701,7 +701,7 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "" #, c-format -msgid "removing all packages from cache... " +msgid "Removing all packages from cache... " msgstr "" #, c-format diff --git a/po/pl.po b/po/pl.po index cf027ac..fbedd33 100644 --- a/po/pl.po +++ b/po/pl.po @@ -739,7 +739,7 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "Czy chcesz usunąć odinstalowane pakiety z pamięci podręcznej?" #, c-format -msgid "removing old packages from cache... " +msgid "Removing old packages from cache... " msgstr "usuwanie starych pakietów z pamięci podręcznej... " #, c-format @@ -755,7 +755,7 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "Czy chcesz usunąć WSZYSTKIE pakiety z pamięci podręcznej?" #, c-format -msgid "removing all packages from cache... " +msgid "Removing all packages from cache... " msgstr "usuwanie wszystkich pakietów z pamięci podręcznej... " #, c-format diff --git a/po/pt_BR.po b/po/pt_BR.po index c540aaf..55e93d1 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -756,7 +756,7 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "Deseja remover os pacotes desatualizados do cache?" #, c-format -msgid "removing old packages from cache... " +msgid "Removing old packages from cache... " msgstr "removendo pacotes antigos do cache... " #, c-format @@ -772,7 +772,7 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "Deseja remover TODOS os pacotes do cache?" #, c-format -msgid "removing all packages from cache... " +msgid "Removing all packages from cache... " msgstr "removendo todos os pacotes do cache... " #, c-format diff --git a/po/ru.po b/po/ru.po index 067f739..8efaa59 100644 --- a/po/ru.po +++ b/po/ru.po @@ -728,7 +728,7 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "Хотите удалить устаревшие пакеты из кэша?" #, c-format -msgid "removing old packages from cache... " +msgid "Removing old packages from cache... " msgstr "удаляю старые пакеты из кэша... " #, c-format @@ -744,7 +744,7 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "Хотите удалить ВСЕ пакеты из кэша?" #, c-format -msgid "removing all packages from cache... " +msgid "Removing all packages from cache... " msgstr "удаляю все пакеты из кэша... " #, c-format diff --git a/po/tr.po b/po/tr.po index 07d877a..9d9dce9 100644 --- a/po/tr.po +++ b/po/tr.po @@ -722,7 +722,7 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "Kaldırılan paketleri önbellekten silmek istiyor musunuz?" #, c-format -msgid "removing old packages from cache... " +msgid "Removing old packages from cache... " msgstr "önbellekteki eski paketler siliniyor... " #, c-format @@ -738,7 +738,7 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "Önbellekteki TÜM paketleri silmek istiyor musunuz?" #, c-format -msgid "removing all packages from cache... " +msgid "Removing all packages from cache... " msgstr "önbellekteki tüm paketler siliniyor... " #, c-format diff --git a/po/uk.po b/po/uk.po index ffd22a0..d472f53 100644 --- a/po/uk.po +++ b/po/uk.po @@ -732,7 +732,7 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "Ви хочете видалити старі пакунки з кешу?" #, c-format -msgid "removing old packages from cache... " +msgid "Removing old packages from cache... " msgstr "видалення старих пакунків з кешу... " #, c-format @@ -748,7 +748,7 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "Ви хочете видалити ВСІ пакунки з кешу?" #, c-format -msgid "removing all packages from cache... " +msgid "Removing all packages from cache... " msgstr "видалення всіх пакунків з кешу... " #, c-format diff --git a/po/zh_CN.po b/po/zh_CN.po index 8727aad..f2cb240 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -673,7 +673,7 @@ msgid "Do you want to remove outdated packages from cache?" msgstr "打算从缓存中删除过期的软件包吗？" #, c-format -msgid "removing old packages from cache... " +msgid "Removing old packages from cache... " msgstr "正在从缓存中删除旧软件包..." #, c-format @@ -689,7 +689,7 @@ msgid "Do you want to remove ALL packages from cache?" msgstr "打算从缓存中删除所有软件包吗？" #, c-format -msgid "removing all packages from cache... " +msgid "Removing all packages from cache... " msgstr "正在从缓存中删除所有软件包..." #, c-format diff --git a/src/pacman/sync.c b/src/pacman/sync.c index d8a6348..261f2d1 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -148,7 +148,7 @@ static int sync_cleancache(int level) /* this should not happen : the config parsing doesn't set any other value */ return(1); } - printf(_("removing old packages from cache... ")); + printf(_("Removing old packages from cache... ")); dir = opendir(cachedir); if(dir == NULL) { @@ -218,7 +218,7 @@ static int sync_cleancache(int level) if(!noyes(_("Do you want to remove ALL packages from cache?"))) { return(0); } - printf(_("removing all packages from cache... ")); + printf(_("Removing all packages from cache... ")); if(rmrf(cachedir)) { pm_fprintf(stderr, PM_LOG_ERROR, _("could not remove cache directory\n")); -- 1.6.3.1

3 4

[pacman-dev] [PATCH] Do not remove conflict by default
by Allan McRae 31 Aug '09

31 Aug '09

When a conflict is detected, pacman asks if the user wants to remove the conflicting package. In many cases this is a bad idea. e.g. udev conflicts with initscripts. Remove initscripts [Y/n] util-linux-ng conflicts with e2fsprogs. Remove e2fsprogs? [Y/n] This changes the query to [y/N]. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/callback.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index e83a97d..0f52343 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -259,7 +259,7 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, alpm_pkg_get_name(data2)); break; case PM_TRANS_CONV_CONFLICT_PKG: - *response = yesno(_(":: %s conflicts with %s. Remove %s?"), + *response = noyes(_(":: %s conflicts with %s. Remove %s?"), (char *)data1, (char *)data2, (char *)data2); -- 1.6.4.1

3 3

[pacman-dev] [PATCH] '-Spp and -Supp' options were added to be able to generate uri list without the downloaded package uris and for all too
by Laszlo Papp 31 Aug '09

31 Aug '09

I tried to modify as Gabor advised, if any problem exists now too, please write a feedback. Signed-off-by: Laszlo Papp <djszapi2(a)gmail.com> --- doc/pacman.8.txt | 6 ++++-- src/pacman/pacman.c | 4 ++-- src/pacman/sync.c | 3 +++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index b288a59..961b9d5 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -305,8 +305,10 @@ linkman:pacman.conf[5]. *-p, \--print-uris*:: Print out URIs for each package that will be installed, including any - dependencies yet to be installed. These can be piped to a file and - downloaded at a later time, using a program like wget. + dependencies yet to be installed, excluding which are in the cachedir. + These can be piped to a file and downloaded at a later time, using a + program like wget. Passing two '\--print-uris' or '-p' flags will + force a print-uris of all package lists even if they are in the cachedir. *-q, \--quiet*:: Show less information for certain sync operations. (This is useful when diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 25647b5..1a49303 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -128,7 +128,7 @@ static void usage(int op, const char * const myname) printf(_(" -g, --groups view all members of a package group\n")); printf(_(" -i, --info view package information\n")); printf(_(" -l, --list <repo> view a list of packages in a repo\n")); - printf(_(" -p, --print-uris print out URIs for given packages and their dependencies\n")); + printf(_(" -p, --print-uris print URIs for packages and their dependencies(-pp for all)\n")); printf(_(" -s, --search <regex> search remote repositories for matching strings\n")); printf(_(" -u, --sysupgrade upgrade all outdated packages (-uu enables downgrade)\n")); printf(_(" -w, --downloadonly download packages but do not install/upgrade anything\n")); @@ -485,7 +485,7 @@ static int parseargs(int argc, char *argv[]) case 'o': config->op_q_owns = 1; break; case 'p': config->op_q_isfile = 1; - config->op_s_printuris = 1; + config->op_s_printuris++; config->flags |= PM_TRANS_FLAG_NOCONFLICTS; config->flags |= PM_TRANS_FLAG_NOLOCK; break; diff --git a/src/pacman/sync.c b/src/pacman/sync.c index dc93621..90f5bb8 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -678,6 +678,9 @@ static int sync_trans(alpm_list_t *targets) pmpkg_t *pkg = alpm_list_getdata(i); pmdb_t *db = alpm_pkg_get_db(pkg); const char *dburl = alpm_db_get_url(db); + if ((config->op_s_printuris == 1) && !alpm_pkg_download_size(pkg)) { + continue; + } if(dburl) { printf("%s/%s\n", dburl, alpm_pkg_get_filename(pkg)); } else { -- 1.6.4.1

2 1

[pacman-dev] [PATCH] makepkg : refactor run_build and run_package
by Xavier Chantry 29 Aug '09

29 Aug '09

These two functions were very similar. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- scripts/makepkg.sh.in | 117 ++++++++++++++++-------------------------------- 1 files changed, 39 insertions(+), 78 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ba45609..422c950 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -674,94 +674,23 @@ extract_sources() { fi } -error_build() { - # first exit all subshells, then print the error - if [ $BASH_SUBSHELL -eq 0 ]; then - error "$(gettext "Build Failed.")" - plain "$(gettext "Aborting...")" - remove_deps - fi - exit 2 # $E_BUILD_FAILED -} - -run_build() { - # use distcc if it is requested (check buildenv and PKGBUILD opts) - if [ "$(check_buildenv distcc)" = "y" -a "$(check_option distcc)" != "n" ]; then - [ -d /usr/lib/distcc/bin ] && export PATH="/usr/lib/distcc/bin:$PATH" - export DISTCC_HOSTS - elif [ "$(check_option distcc)" = "n" ]; then - # if it is not wanted, clear the makeflags too - MAKEFLAGS="" - fi - - # use ccache if it is requested (check buildenv and PKGBUILD opts) - if [ "$(check_buildenv ccache)" = "y" -a "$(check_option ccache)" != "n" ]; then - [ -d /usr/lib/ccache/bin ] && export PATH="/usr/lib/ccache/bin:$PATH" - fi - - # clear user-specified makeflags if requested - if [ "$(check_option makeflags)" = "n" ]; then - MAKEFLAGS="" - fi - - msg "$(gettext "Starting build()...")" - cd "$srcdir" - - # ensure all necessary build variables are exported - export CFLAGS CXXFLAGS MAKEFLAGS LDFLAGS CHOST - # save our shell options so build() can't override what we need - local shellopts=$(shopt -p) - - local ret=0 - if [ "$LOGGING" -eq 1 ]; then - BUILDLOG="${startdir}/${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-build.log" - if [ -f "$BUILDLOG" ]; then - local i=1 - while true; do - if [ -f "$BUILDLOG.$i" ]; then - i=$(($i +1)) - else - break - fi - done - mv "$BUILDLOG" "$BUILDLOG.$i" - fi - - set +E - build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]} - set -E - if [ $ret -gt 0 ]; then error_build; fi - else - restoretrap=$(trap -p ERR) - trap 'error_build' ERR - build 2>&1 - eval $restoretrap - fi - # reset our shell options - eval "$shellopts" -} - -error_package() { +error_function() { if [ -p "$logpipe" ]; then rm "$logpipe" fi # first exit all subshells, then print the error if [ $BASH_SUBSHELL -eq 0 ]; then - error "$(gettext "Packaging Failed.")" plain "$(gettext "Aborting...")" remove_deps fi exit 2 # $E_BUILD_FAILED } -run_package() { +run_function() { if [ -z "$1" ]; then - pkgfunc="package" - nameofpkg="$pkgname" - else - pkgfunc="package_$1" - nameofpkg="$1" + return 1 fi + pkgfunc="$1" # clear user-specified makeflags if requested if [ "$(check_option makeflags)" = "n" ]; then @@ -773,10 +702,12 @@ run_package() { # ensure all necessary build variables are exported export CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS CHOST + # save our shell options so pkgfunc() can't override what we need + local shellopts=$(shopt -p) local ret=0 if [ "$LOGGING" -eq 1 ]; then - BUILDLOG="${startdir}/${nameofpkg}-${pkgver}-${pkgrel}-${CARCH}-package.log" + BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}-$pkgfunc.log" if [ -f "$BUILDLOG" ]; then local i=1 while true; do @@ -796,7 +727,7 @@ run_package() { tee "$BUILDLOG" < "$logpipe" & exec 1>"$logpipe" 2>"$logpipe" restoretrap=$(trap -p ERR) - trap 'error_package' ERR + trap 'error_function' ERR $pkgfunc 2>&1 eval $restoretrap sync @@ -804,10 +735,40 @@ run_package() { rm "$logpipe" else restoretrap=$(trap -p ERR) - trap 'error_package' ERR + trap 'error_function' ERR $pkgfunc 2>&1 eval $restoretrap fi + # reset our shell options + eval "$shellopts" +} + +run_build() { + # use distcc if it is requested (check buildenv and PKGBUILD opts) + if [ "$(check_buildenv distcc)" = "y" -a "$(check_option distcc)" != "n" ]; then + [ -d /usr/lib/distcc/bin ] && export PATH="/usr/lib/distcc/bin:$PATH" + export DISTCC_HOSTS + elif [ "$(check_option distcc)" = "n" ]; then + # if it is not wanted, clear the makeflags too + MAKEFLAGS="" + fi + + # use ccache if it is requested (check buildenv and PKGBUILD opts) + if [ "$(check_buildenv ccache)" = "y" -a "$(check_option ccache)" != "n" ]; then + [ -d /usr/lib/ccache/bin ] && export PATH="/usr/lib/ccache/bin:$PATH" + fi + + run_function "build" +} + +run_package() { + if [ -z "$1" ]; then + pkgfunc="package" + else + pkgfunc="package_$1" + fi + + run_function "$pkgfunc" } tidy_install() { -- 1.6.4.1

2 1

[pacman-dev] [PATCH] makepkg: exit on error during build() or package()
by Henning Garus 29 Aug '09

29 Aug '09

Set the ERR trap to abort upon encountering an error during the execution of a build or package function. Activate set -E, which lets functions inherit the ERR trap. Signed-off-by: Henning Garus <henning.garus(a)gmail.com> --- scripts/makepkg.sh.in | 48 +++++++++++++++++++++++++++++++++++------------- 1 files changed, 35 insertions(+), 13 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index daa9585..bacf13f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -174,6 +174,7 @@ clean_up() { ## # Signal Traps ## +set -E trap 'clean_up' 0 trap 'trap_exit "$(gettext "TERM signal caught. Exiting...")"' TERM HUP QUIT trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT @@ -673,6 +674,16 @@ extract_sources() { fi } +error_build() { + # first exit all subshells, then print the error + if [ $BASH_SUBSHELL -eq 0 ]; then + error "$(gettext "Build Failed.")" + plain "$(gettext "Aborting...")" + remove_deps + fi + exit 2 # $E_BUILD_FAILED +} + run_build() { # use distcc if it is requested (check buildenv and PKGBUILD opts) if [ "$(check_buildenv distcc)" = "y" -a "$(check_option distcc)" != "n" ]; then @@ -716,19 +727,31 @@ run_build() { mv "$BUILDLOG" "$BUILDLOG.$i" fi + set +E build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]} + set -E + if [ $ret -gt 0 ]; then error_build; fi else - build 2>&1 || ret=$? + restoretrap=$(trap -p ERR) + trap 'error_build' ERR + build 2>&1 + eval $restoretrap fi # reset our shell options eval "$shellopts" +} - if [ $ret -gt 0 ]; then - error "$(gettext "Build Failed.")" +error_package() { + if [ -p "$logpipe" ]; then + rm "$logpipe" + fi + # first exit all subshells, then print the error + if [ $BASH_SUBSHELL -eq 0 ]; then + error "$(gettext "Packaging Failed.")" plain "$(gettext "Aborting...")" remove_deps - exit 2 # $E_BUILD_FAILED fi + exit 2 # $E_BUILD_FAILED } run_package() { @@ -772,19 +795,18 @@ run_package() { exec 3>&1 tee "$BUILDLOG" < "$logpipe" & exec 1>"$logpipe" 2>"$logpipe" - $pkgfunc 2>&1 || ret=$? + restoretrap=$(trap -p ERR) + trap 'error_package' ERR + $pkgfunc 2>&1 + eval $restoretrap sync exec 1>&3 2>&3 3>&- rm "$logpipe" else - $pkgfunc 2>&1 || ret=$? - fi - - if [ $ret -gt 0 ]; then - error "$(gettext "Packaging Failed.")" - plain "$(gettext "Aborting...")" - remove_deps - exit 2 # $E_BUILD_FAILED + restoretrap=$(trap -p ERR) + trap 'error_package' ERR + $pkgfunc 2>&1 + eval $restoretrap fi } -- 1.6.4.1

2 1

[pacman-dev] [PATCH] add support for .so dependencies
by bluewind＠server-speed.net 28 Aug '09

28 Aug '09

From: Florian Pritz <bluewind(a)xssn.at> Support-by: brain0 <thomas(a)archlinux.org> Support-by: GNU\caustic <Christoph.Schied(a)uni-ulm.de> --- etc/makepkg.conf.in | 3 ++- scripts/makepkg.sh.in | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletions(-) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 3a3a415..c3caf3c 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -67,8 +67,9 @@ BUILDENV=(fakeroot !distcc color !ccache) #-- emptydirs: Leave empty directories in packages #-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip #-- purge: Remove files specified by PURGE_TARGETS +#-- sodepends: add .so files to depends/provides arrays # -OPTIONS=(strip docs libtool emptydirs zipman purge) +OPTIONS=(strip docs libtool emptydirs zipman purge !sodepends) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index daa9585..405f3cb 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -872,6 +872,33 @@ tidy_install() { fi } +find_sodependencies() +{ + find $pkgdir | while read filename + do + arch=$(readelf -h "$filename" 2> /dev/null| sed -nr 's/.*Class:.*ELF(.*).*/\1/p') + [ -n "$arch" ] || continue + + readelf -d "$filename" 2> /dev/null | sed -nr 's/.*Shared library: \[(.*)\].*/\1/p' \ + | while read dep + do + echo sodep-${arch}-${dep} + done + done +} + +find_soprovides() +{ + find $pkgdir -name \*.so | while read filename + do + arch=$(readelf -h "$filename" 2> /dev/null| sed -nr 's/.*Class:.*ELF(.*).*/\1/p') + [ -n "$arch" ] || continue + soname=$(readelf -d "$filename" 2>/dev/null | sed -nr 's/.*Library soname: \[(.*)\].*/\1/p') + [ -n "$soname" ] || continue + echo sodep-${arch}-${soname} + done +} + write_pkginfo() { local builddate=$(date -u "+%s") if [ -n "$PACKAGER" ]; then @@ -902,6 +929,22 @@ write_pkginfo() { echo "force = true" >> .PKGINFO fi + if [ "$(check_option sodepends)" = "y" ]; then + sodepends=$(find_sodependencies) + soprovides=$(find_soprovides) + + OLDIFS="$IFS" + IFS="" + + # filter .so files provided by the package itself + sodepends=$(echo $sodepends $soprovides $soprovides | sort | uniq -u) + + IFS="$OLDIFS" + + depends=($depends $sodepends) + provices=($provides $soprovides) + fi + local it for it in "${license[@]}"; do echo "license = $it" >>.PKGINFO -- 1.6.4

7 19

[pacman-dev] [PATCH] Configure: Check if libfetch version is >= 2.21
by Henning Garus 24 Aug '09

24 Aug '09

Commit 6f97842 started using libfetch's conditional GET. This requires libfetch to be version 2.21 or greater. Change configure.ac to check for the existence of the last_modified field in the url struct, which was introduced with libfetch 2.21. Signed-off-by: Henning Garus <henning.garus(a)gmail.com> --- configure.ac | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index b2164b9..40d8e13 100644 --- a/configure.ac +++ b/configure.ac @@ -142,7 +142,12 @@ if test "x$internaldownload" = "xyes" ; then AC_MSG_RESULT(yes) AC_DEFINE([INTERNAL_DOWNLOAD], , [Use internal download library]) # Check for a download library if it was actually requested - AC_CHECK_LIB([fetch], [fetchParseURL], , + AC_CHECK_LIB([fetch], [fetchParseURL], + # Check if libfetch supports conditional GET + # (version >=2.21, struct url has member last_modified) + AC_CHECK_MEMBER(struct url.last_modified, , + AC_MSG_ERROR([libfetch must be version 2.21 or greater]), + [#include <fetch.h>] ), AC_MSG_ERROR([libfetch is needed to compile with internal download support]) ) else AC_MSG_RESULT(no) -- 1.6.4.1

2 2

[pacman-dev] pacman-git/master doesn't compile to me
by Nagy Gabor 24 Aug '09

24 Aug '09

Hi! Since bugs.archlinux.org is off-line, I send my problem here. When I want to compile pacman, I get the following error: dload.c: In function ‘download_internal’: dload.c:107: error: ‘struct url’ has no member named ‘last_modified’ dload.c:145: error: ‘FETCH_UNCHANGED’ undeclared (first use in this function) dload.c:145: error: (Each undeclared identifier is reported only once dload.c:145: error: for each function it appears in.) Probably my libfetch is too old, but our autoconf system should catch this. Bye

3 3

[pacman-dev] [PATCH] makepkg: exit on error during build() or package()
by Henning Garus 23 Aug '09

23 Aug '09

Set the ERR trap to abort upon encountering an error during the execution of a build or package function. Activate set -E, which lets functions inherit the ERR trap. Signed-off-by: Henning Garus <henning.garus(a)gmail.com> --- scripts/makepkg.sh.in | 45 ++++++++++++++++++++++++++++++++------------- 1 files changed, 32 insertions(+), 13 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index daa9585..bb0542c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -174,6 +174,7 @@ clean_up() { ## # Signal Traps ## +set -E trap 'clean_up' 0 trap 'trap_exit "$(gettext "TERM signal caught. Exiting...")"' TERM HUP QUIT trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT @@ -673,6 +674,16 @@ extract_sources() { fi } +error_build() { + # first exit all subshells, then print the error + if [ $BASH_SUBSHELL -eq 0 ]; then + error "$(gettext "Build Failed.")" + plain "$(gettext "Aborting...")" + remove_deps + fi + exit 2 # $E_BUILD_FAILED +} + run_build() { # use distcc if it is requested (check buildenv and PKGBUILD opts) if [ "$(check_buildenv distcc)" = "y" -a "$(check_option distcc)" != "n" ]; then @@ -716,19 +727,28 @@ run_build() { mv "$BUILDLOG" "$BUILDLOG.$i" fi + set +E build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]} + set -E + if [ $ret -gt 0 ]; then error_build; fi else - build 2>&1 || ret=$? + restoretrap=$(trap -p ERR) + trap 'error_build' ERR + build 2>&1 + eval $restoretrap fi # reset our shell options eval "$shellopts" +} - if [ $ret -gt 0 ]; then - error "$(gettext "Build Failed.")" +error_package() { + # first exit all subshells, then print the error + if [ $BASH_SUBSHELL -eq 0 ]; then + error "$(gettext "Packaging Failed.")" plain "$(gettext "Aborting...")" remove_deps - exit 2 # $E_BUILD_FAILED fi + exit 2 # $E_BUILD_FAILED } run_package() { @@ -772,19 +792,18 @@ run_package() { exec 3>&1 tee "$BUILDLOG" < "$logpipe" & exec 1>"$logpipe" 2>"$logpipe" - $pkgfunc 2>&1 || ret=$? + restoretrap=$(trap -p ERR) + trap 'error_package' ERR + $pkgfunc 2>&1 + eval $restoretrap sync exec 1>&3 2>&3 3>&- rm "$logpipe" else - $pkgfunc 2>&1 || ret=$? - fi - - if [ $ret -gt 0 ]; then - error "$(gettext "Packaging Failed.")" - plain "$(gettext "Aborting...")" - remove_deps - exit 2 # $E_BUILD_FAILED + restoretrap=$(trap -p ERR) + trap 'error_package' ERR + $pkgfunc 2>&1 + eval $restoretrap fi } -- 1.6.4

3 4

[pacman-dev] [PATCH] makepkg: always keep sources symlinks
by Xavier Chantry 23 Aug '09

23 Aug '09

Make bunzip2/xz/gunzip decompressing to stdout, because gzip does not offer something like a -k option. The selection of the decompression command for gzip/bzip2/xz compressed files now also depends on the file suffix, since we need to strip the extensions to get the output filename. Thanks to Cedric Staniewski <cedric(a)gmx.ca> for reporting this issue and contributing patches. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- scripts/makepkg.sh.in | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 126379a..80d3867 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -646,16 +646,26 @@ extract_sources() { # fix flyspray #6246 local file_type=$(file -bizL "$file") + local ext=${file##*.} local cmd='' case "$file_type" in *application/x-tar*|*application/zip*|*application/x-zip*|*application/x-cpio*) - cmd="bsdtar -x -f" ;; + cmd="bsdtar" ;; *application/x-gzip*) - cmd="gunzip -d -f" ;; + case "$ext" in + gz|z|Z) cmd="gzip" ;; + *) continue;; + esac ;; *application/x-bzip*) - cmd="bunzip2 -f" ;; + case "$ext" in + bz2|bz) cmd="bzip2" ;; + *) continue;; + esac ;; *application/x-xz*) - cmd="xz -d -f" ;; + case "$ext" in + xz) cmd="xz" ;; + *) continue;; + esac ;; *) # Don't know what to use to extract this file, # skip to the next file @@ -663,8 +673,13 @@ extract_sources() { esac local ret=0 - msg2 '%s' "$cmd \"$file\"" - $cmd "$file" || ret=$? + msg2 "$(gettext "extracting %s with %s")" "$file" "$cmd" + if [ "$cmd" = "bsdtar" ]; then + $cmd -xf "$file" || ret=? + else + rm -f "${file%.*}" + $cmd -dcf "$file" > "${file%.*}" || ret=? + fi if [ $ret -ne 0 ]; then error "$(gettext "Failed to extract %s")" "$file" plain "$(gettext "Aborting...")" -- 1.6.4.1

1 0