- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.0-32-g3de32a0
by dan＠archlinux.org 24 Aug '10

24 Aug '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 3de32a08126480f2a9cd67d09ef104accfde8992 (commit) via 71660f55b22050219cb582def2ee246084e55893 (commit) via 4a487346c57ca6ea2beedad5f670313670fe1971 (commit) via 0478dfa1a58ca4a127897af0b90ac3a579adb06f (commit) from 281bc725342e07d314f412ba6c930c3efb8f623c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: NEWS | 10 + doc/PKGBUILD.5.txt | 12 +- lib/libalpm/po/LINGUAS | 1 + lib/libalpm/po/{en_GB.po => sk.po} | 263 +++++----- po/LINGUAS | 1 + po/ca.po | 13 +- po/cs.po | 12 +- po/de.po | 7 +- po/el.po | 13 +- po/en_GB.po | 7 +- po/es.po | 13 +- po/fr.po | 62 ++-- po/hu.po | 7 +- po/it.po | 7 +- po/kk.po | 13 +- po/nb.po | 13 +- po/pacman.pot | 6 +- po/pl.po | 13 +- po/pt_BR.po | 12 +- po/ro.po | 13 +- po/ru.po | 7 - po/{en_GB.po => sk.po} | 996 ++++++++++++++++++------------------ po/sv.po | 13 +- po/tr.po | 13 +- po/uk.po | 13 +- po/zh_CN.po | 11 +- 26 files changed, 708 insertions(+), 843 deletions(-) copy lib/libalpm/po/{en_GB.po => sk.po} (52%) mode change 100644 => 100755 copy po/{en_GB.po => sk.po} (51%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.0-76-g8d88f0c
by dan＠archlinux.org 24 Aug '10

24 Aug '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 8d88f0c897e5dd531a2c74dd2bca56db56a3c63d (commit) via a28868eeae98b28c00f8112e8d81403ad21a3117 (commit) via 08e1d4764cdc7f62b11be4b411071b6a87118c93 (commit) via f04530eb618a3f7e7ee1dd15f0b2907fc28bed98 (commit) via 68d8bfa0b5c15e1ddbc7f81cd23bf464674413f9 (commit) via 3de32a08126480f2a9cd67d09ef104accfde8992 (commit) via f27fed14b16dc85da104ae4c463ba6040d7e4d64 (commit) via 298cbf2cb152df365a593a396266636a9d34355f (commit) via 48589ccc64c5e7266f70c6294087e8b0450953e9 (commit) via d896527d21107afe69328ac465a3d2f0e318ddca (commit) via 71660f55b22050219cb582def2ee246084e55893 (commit) via 4a487346c57ca6ea2beedad5f670313670fe1971 (commit) via 0478dfa1a58ca4a127897af0b90ac3a579adb06f (commit) via ce3f4e7800f215e8a2b6e22bbd5f5ec9e0de90c2 (commit) via 281bc725342e07d314f412ba6c930c3efb8f623c (commit) via 5908992e4730263edb8255439560d5411d28c895 (commit) via c3f537538029285cca2ebb22975db60033a78c40 (commit) via b02bda75f14f35817d1757863d0b3c4cf09a0677 (commit) via 815557118318779f784e82a39497f46dde32845d (commit) via e7d5803f07c11882685e2a65b5638fd385804d22 (commit) from ddc4130c978decc5b2498b24d3b20e0c4efbc3cf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8d88f0c897e5dd531a2c74dd2bca56db56a3c63d Merge: a28868e 3de32a0 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 23 21:53:06 2010 -0500 Merge branch 'maint' commit a28868eeae98b28c00f8112e8d81403ad21a3117 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Aug 5 21:37:22 2010 +1000 makepkg: error out on empty optdepends entries If optdepends was defined with empty members, then makepkg would abort late in the package building process. Detect such cases in the check_sanity() function. Fix-provided-by: Andres P <aepd87(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 08e1d4764cdc7f62b11be4b411071b6a87118c93 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Aug 5 21:35:54 2010 +1000 makepkg: use less local variables in check_sanity Instead of declaring a new local variable for each loop in the check_sanity() function, just reuse $i. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f04530eb618a3f7e7ee1dd15f0b2907fc28bed98 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Aug 5 21:12:11 2010 +1000 makepkg: remove unnecessary variable presence check It is unnecessary to check for a variables existence before looping over it. Extracted from patch supplied by Andres P <aepd87(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 68d8bfa0b5c15e1ddbc7f81cd23bf464674413f9 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Aug 5 21:01:32 2010 +1000 makepkg: clarify invalid backup entry errors "Invalid backup entry" was not a particular helpful error message, especially when it was due to the file not being in the final package. Clarify these two messages. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f27fed14b16dc85da104ae4c463ba6040d7e4d64 Author: Andres P <aepd87(a)gmail.com> Date: Fri Jun 25 18:46:40 2010 -0430 makepkg: less code duplication in create_package Combine changelog and install file creation in create_package(). Signed-off-by: Andres P <aepd87(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 298cbf2cb152df365a593a396266636a9d34355f Author: Allan McRae <allan(a)archlinux.org> Date: Thu Aug 5 20:44:34 2010 +1000 makepkg: use regex to match options for privilege escalation Eases maintanence if we need to add further options in the future. Extracted from a patch supplied by Andres P <aepd87(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 48589ccc64c5e7266f70c6294087e8b0450953e9 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Jul 7 16:58:51 2010 +1000 Fix some whitespace issues The combination of tabs and spaces is annoying in any editor that does not use a tab width of 2 spaces. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d896527d21107afe69328ac465a3d2f0e318ddca Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jul 7 17:12:42 2010 -0500 fgets invocation cleanup From the fgets manpage: fgets() reads in at most one less than size characters from stream and stores them into the buffer pointed to by s. Reading stops after an EOF or a newline. If a newline is read, it is stored into the buffer. A '\0' is stored after the last character in the buffer. This means there is no need at all to do 'size - 1' math. Remove all of that and just use sizeof() for simplicity on the buffer we plan on reading into. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ce3f4e7800f215e8a2b6e22bbd5f5ec9e0de90c2 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 23 17:42:22 2010 -0500 Enable libfetch connection caching This will allow downloads to reuse connections if possible, which could make big differences on perceived FTP speed as the connection won't have to be reestablished each time. For the most part, HTTP requests wouldn't be using keep alive anyway so this won't have an effect there. I'm not enthused about having to do this with the library initialization, but there isn't a much better place due to the fact that the loop over databases occurs on the frontend and not the backend. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 815557118318779f784e82a39497f46dde32845d Author: Thomas Bächler <thomas(a)archlinux.org> Date: Sat Aug 7 12:47:59 2010 +0200 makepkg: Allow creation of uncompressed packages When performing local testing, it may be useful to add PKGEXT='.pkg.tar' to the PKGBUILD to save time, especially with big packages. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e7d5803f07c11882685e2a65b5638fd385804d22 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jul 27 15:50:43 2010 -0500 Use the plural features of gettext Gettext has this whole 'Plural-Form' thing that until now we haven't taken advantage of. Given that not all languages have the same plural form rules as English, take advantage of it by defining a new _n() macro which will normally define to ngettext(), and adjust a few messages as an example of how to use. There are surely other places where we do singular/plural logic without me having noticed, so further patches are welcome to fix those up too. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 10 + doc/PKGBUILD.5.txt | 12 +- lib/libalpm/alpm.c | 13 + lib/libalpm/be_files.c | 59 +-- lib/libalpm/be_package.c | 2 +- lib/libalpm/conflict.c | 2 +- lib/libalpm/package.h | 6 +- lib/libalpm/po/LINGUAS | 1 + lib/libalpm/po/pl.po | 99 +---- lib/libalpm/po/{en_GB.po => sk.po} | 263 +++++----- lib/libalpm/trans.c | 5 +- po/LINGUAS | 1 + po/ca.po | 13 +- po/cs.po | 12 +- po/de.po | 7 +- po/el.po | 13 +- po/en_GB.po | 7 +- po/es.po | 13 +- po/fr.po | 62 ++-- po/hu.po | 7 +- po/it.po | 7 +- po/kk.po | 13 +- po/nb.po | 13 +- po/pacman.pot | 6 +- po/pl.po | 183 +++---- po/pt_BR.po | 12 +- po/ro.po | 13 +- po/ru.po | 7 - po/{en_GB.po => sk.po} | 996 ++++++++++++++++++------------------ po/sv.po | 13 +- po/tr.po | 13 +- po/uk.po | 13 +- po/zh_CN.po | 11 +- scripts/makepkg.sh.in | 114 +++-- scripts/repo-add.sh.in | 5 +- src/pacman/callback.c | 13 +- src/pacman/query.c | 6 +- src/pacman/util.c | 5 +- src/pacman/util.h | 2 + 39 files changed, 922 insertions(+), 1130 deletions(-) copy lib/libalpm/po/{en_GB.po => sk.po} (52%) mode change 100644 => 100755 copy po/{en_GB.po => sk.po} (51%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Enable libfetch connection caching
by Dan McGee 23 Aug '10

23 Aug '10

This will allow downloads to reuse connections if possible, which could make big differences on perceived FTP speed as the connection won't have to be reestablished each time. For the most part, HTTP requests wouldn't be using keep alive anyway so this won't have an effect there. I'm not enthused about having to do this with the library initialization, but there isn't a much better place due to the fact that the loop over databases occurs on the frontend and not the backend. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/alpm.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 51b9e25..7bcfc8f 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -23,6 +23,11 @@ #include "config.h" +/* connection caching setup */ +#if defined(INTERNAL_DOWNLOAD) +#include <fetch.h> +#endif + /* libalpm */ #include "alpm.h" #include "alpm_list.h" @@ -54,6 +59,10 @@ int SYMEXPORT alpm_initialize(void) bindtextdomain("libalpm", LOCALEDIR); #endif +#ifdef INTERNAL_DOWNLOAD + fetchConnectionCacheInit(5, 1); +#endif + return(0); } @@ -73,6 +82,10 @@ int SYMEXPORT alpm_release(void) _alpm_handle_free(handle); handle = NULL; +#ifdef INTERNAL_DOWNLOAD + fetchConnectionCacheClose(); +#endif + return(0); } -- 1.7.2.1

1 0

[pacman-dev] system to obviate need for DESTDIR hacks and improve PKGBUILD security
by James Pike 22 Aug '10

22 Aug '10

Hi, I've just release a system call interceptor system to freshmeat that uses LD_PRELOAD style wrappers to intercept and modify system calls. No root priveleges or chroot needed. I'm just finishing work now on a plugin for it that redirects system call writes and other file modifying events to a different directory offset: for example now when you do: make DESTDIR="$pkgdir" install You could do pito redirect -d"$pkgdir" make install There are some pretty large hacks and patches necessary in some PKGBUILDs to get packages to respect DESTDIR which would be no longer necessary if they utilised pito. pito redirect also fakes the root user and captures operations like "chmod" and "chown" so: pito redirect -upacman -d"$pkgdir" make install When run as root.. will run the "make install" as the user pacman, and then after the operation is finished will use its root privileges to chown files securely within $pkgdir as necessary. I believe arch currently runs install operations as root so the above method would increase security as it would remove the ability for packages to write to the file system in any way other than to $pkgdir (any writes that could theoretically escape the sandbox would only be as a user with low privileges anyway). There are also flags to allow writes to certain directories and remove default some basic needed allowed writes such as to /dev etc. I hope this project will be of use! The website for pito is http://chilon.net/pito. -- +44 (0) 7974 159 643 | james(a)chilon.net | http://chilon.net

2 1

[pacman-dev] Fwd: [Arch Linux] patch for bacman from pacman-contrib package
by Allan McRae 22 Aug '10

22 Aug '10

Forwarding to the pacman-dev list. I'd prefer some copying of the code we use in makepkg to decide how to compress a package based on PKGEXT. Alla -------- Original Message -------- Subject: [Arch Linux] patch for bacman from pacman-contrib package Date: Sat, 21 Aug 2010 11:58:17 +1000 From: Nelson Chan <khcha.n.el(a)gmail.com> To: allan(a)archlinux.org originally, bacman doesn't catch up with current .pkg.tar.xz package format it produces a package named according /etc/makepkg.conf (e.g. *.pkg.tar.xz) but it fact it created a .gz format instead of xz Package : pacman-contrib (version 3.4.0-1) Component: /usr/bin/bacman (version 0.2.1) --- Nelson Chan here is the patch: --- bacman.orig 2010-08-21 00:15:43.480000752 +1000 +++ bacman 2010-08-21 00:22:20.440001311 +1000 @@ -87,7 +87,7 @@ pkg_arch=${CARCH:-'unknown'} pkg_dest="${PKGDEST:-$PWD}" -pkg_ext=${PKGEXT:-'.pkg.tar.gz'} +pkg_ext=${PKGEXT} pkg_pkger=${PACKAGER:-'Unknown Packager'} pkg_name="$1" @@ -266,7 +266,15 @@ echo "Generating the package..." ret=0 -bsdtar -czf "$pkg_dest/$pkg_namver-$pkg_arch$pkg_ext" $(ls -A) || ret=$? +if [[ $pkg_ext == ".pkg.tar.xz" ]]; then + tar -cJf "$pkg_dest/$pkg_namver-$pkg_arch.pkg.tar.xz" $(ls -A) || ret=$? +elif [[ $pkg_ext == ".pkg.tar.bz2" ]]; then + bsdtar -cyf "$pkg_dest/$pkg_namver-$pkg_arch.pkg.tar.bz2" $(ls -A) || ret=$? +else + bsdtar -czf "$pkg_dest/$pkg_namver-$pkg_arch.pkg.tar.gz" $(ls -A) || ret=$? +fi + + if [ $ret -ne 0 ]; then echo "ERROR: unable to write package to $pkg_dest" echo " Maybe the disk is full or you do not have write access"

2 1

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.0-28-g281bc72
by dan＠archlinux.org 18 Aug '10

18 Aug '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 281bc725342e07d314f412ba6c930c3efb8f623c (commit) via 5908992e4730263edb8255439560d5411d28c895 (commit) via c3f537538029285cca2ebb22975db60033a78c40 (commit) via b02bda75f14f35817d1757863d0b3c4cf09a0677 (commit) from 0d6efb35ce445747cdc37b4f58cdf63463de6e1a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 281bc725342e07d314f412ba6c930c3efb8f623c Author: Dan McGee <dan(a)archlinux.org> Date: Wed Aug 18 13:17:46 2010 -0500 repo-add: create relative DB symlinks As noted in FS#20498, if an absolute path is used for specifying the database when invoking repo-add, the symlink generated will point to the absolute path instead of being relative to the directory. Fix this for the two linking cases, but leave the copy untouched so that will still work. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5908992e4730263edb8255439560d5411d28c895 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Aug 5 20:16:56 2010 +1000 makepkg: add file to the list of needed utilities Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c3f537538029285cca2ebb22975db60033a78c40 Author: Mateusz Herych <heniekk(a)gmail.com> Date: Wed Aug 4 14:09:26 2010 +1000 Updates for Polish translations Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b02bda75f14f35817d1757863d0b3c4cf09a0677 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Aug 3 14:29:26 2010 +1000 makepkg: check tput support before using Prevent makepkg aborting whe colors are enabled and the terminal does not support setting colors by tput. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/pl.po | 99 +++------------------------ po/pl.po | 172 +++++++++++++++++++++--------------------------- scripts/makepkg.sh.in | 24 +++++-- scripts/repo-add.sh.in | 5 +- 4 files changed, 107 insertions(+), 193 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] repo-add: create relative DB symlinks
by Dan McGee 18 Aug '10

18 Aug '10

As noted in FS#20498, if an absolute path is used for specifying the database when invoking repo-add, the symlink generated will point to the absolute path instead of being relative to the directory. Fix this for the two linking cases, but leave the copy untouched so that will still work. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/repo-add.sh.in | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 2838f81..283ad07 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -488,8 +488,9 @@ if (( success )); then [[ -f $REPO_DB_FILE ]] && mv -f "$REPO_DB_FILE" "${REPO_DB_FILE}.old" [[ -f $tmpdir/$filename ]] && mv "$tmpdir/$filename" "$REPO_DB_FILE" dblink="${REPO_DB_FILE%.tar.*}" - ln -sf "$REPO_DB_FILE" "$dblink" 2>/dev/null || \ - ln -f "$REPO_DB_FILE" "$dblink" 2>/dev/null || \ + target=${REPO_DB_FILE##*/} + ln -sf "$target" "$dblink" 2>/dev/null || \ + ln -f "$target" "$dblink" 2>/dev/null || \ cp "$REPO_DB_FILE" "$dblink" else msg "$(gettext "No packages modified, nothing to do.")" -- 1.7.2.1

1 0

[pacman-dev] pyalpmm in version 0.3
by Markus Meissner 18 Aug '10

18 Aug '10

Hey Guys, just wanted to announce the 0.3 release of pyalpmm including transparent AUR support (searching, dependency resolving between AUR and regular repos), a new highest-possible-level API class called System, which allows you to add/remove/build/search/upgrade/update in mostly just one line of code and many more features and a now (nearly) frozen API. The bbs thread: https://bbs.archlinux.org/viewtopic.php?id=60711 should give you a little insight what happend, and also the project homepage of course: http://www.infolexikon.de/code/pyalpmm/ If you've any questions/feedback feel free to write me. regards Markus Meissner

1 0

[pacman-dev] [PATCH 1/2] redirect scriptlet stderr synchronously through alpm
by Jonathan Conder 18 Aug '10

18 Aug '10

Fixes FS#18770, and hopefully an occasional deadlock in my frontend as well. For simplicity it redirects all scriptlet output through SCRIPTLET_INFO, and all callbacks in the child process have been replaced for thread-safety. Also adds a shell to the fake root set up for pactests, which was not needed previously due to a bug (debian #582847) in fakechroot. Signed-off-by: Jonathan Conder <j(a)skurvy.no-ip.org> --- lib/libalpm/util.c | 91 +++++++++++++++++++++++++++++------------------- test/pacman/pmtest.py | 5 ++- 2 files changed, 59 insertions(+), 37 deletions(-) I noticed the list has been quiet for a while, so I thought this would be a good time to resubmit. Only change here is the location of the pactest, which git moved automagically :). I am nearly certain now that this will fix the deadlock in my frontend (for details see the RATIONALE section of man pthread_atfork). diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index ffebe9e..46460f0 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -456,6 +456,7 @@ int _alpm_run_chroot(const char *root, const char *cmd) { char cwd[PATH_MAX]; pid_t pid; + int pipefd[2]; int restore_cwd = 0; int retval = 0; @@ -479,6 +480,12 @@ int _alpm_run_chroot(const char *root, const char *cmd) /* Flush open fds before fork() to avoid cloning buffers */ fflush(NULL); + if(pipe(pipefd) == -1) { + _alpm_log(PM_LOG_ERROR, _("could not create pipe (%s)\n"), strerror(errno)); + retval = 1; + goto cleanup; + } + /* fork- parent and child each have seperate code blocks below */ pid = fork(); if(pid == -1) { @@ -488,55 +495,67 @@ int _alpm_run_chroot(const char *root, const char *cmd) } if(pid == 0) { - FILE *pipe; /* this code runs for the child only (the actual chroot/exec) */ - _alpm_log(PM_LOG_DEBUG, "chrooting in %s\n", root); + close(1); + close(2); + while(dup2(pipefd[1], 1) == -1 && errno == EINTR); + while(dup2(pipefd[1], 2) == -1 && errno == EINTR); + close(pipefd[0]); + close(pipefd[1]); + + /* use fprintf instead of _alpm_log to send output through the parent */ if(chroot(root) != 0) { - _alpm_log(PM_LOG_ERROR, _("could not change the root directory (%s)\n"), - strerror(errno)); + fprintf(stderr, _("could not change the root directory (%s)\n"), strerror(errno)); exit(1); } if(chdir("/") != 0) { - _alpm_log(PM_LOG_ERROR, _("could not change directory to / (%s)\n"), - strerror(errno)); + fprintf(stderr, _("could not change directory to / (%s)\n"), strerror(errno)); exit(1); } umask(0022); - pipe = popen(cmd, "r"); - if(!pipe) { - _alpm_log(PM_LOG_ERROR, _("call to popen failed (%s)\n"), - strerror(errno)); - exit(1); - } - while(!feof(pipe)) { - char line[PATH_MAX]; - if(fgets(line, PATH_MAX, pipe) == NULL) - break; - alpm_logaction("%s", line); - EVENT(handle->trans, PM_TRANS_EVT_SCRIPTLET_INFO, line, NULL); - } - retval = pclose(pipe); - exit(WEXITSTATUS(retval)); + execl("/bin/sh", "sh", "-c", cmd, (char *) NULL); + fprintf(stderr, _("call to execl failed (%s)\n"), strerror(errno)); + exit(1); } else { /* this code runs for the parent only (wait on the child) */ - pid_t retpid; int status; - do { - retpid = waitpid(pid, &status, 0); - } while(retpid == -1 && errno == EINTR); - if(retpid == -1) { - _alpm_log(PM_LOG_ERROR, _("call to waitpid failed (%s)\n"), - strerror(errno)); + FILE *pipe; + + close(pipefd[1]); + pipe = fdopen(pipefd[0], "r"); + if(pipe == NULL) { + close(pipefd[0]); retval = 1; - goto cleanup; } else { - /* check the return status, make sure it is 0 (success) */ - if(WIFEXITED(status)) { - _alpm_log(PM_LOG_DEBUG, "call to waitpid succeeded\n"); - if(WEXITSTATUS(status) != 0) { - _alpm_log(PM_LOG_ERROR, _("command failed to execute correctly\n")); - retval = 1; - } + while(!feof(pipe)) { + char line[PATH_MAX]; + if(fgets(line, PATH_MAX, pipe) == NULL) + break; + alpm_logaction("%s", line); + EVENT(handle->trans, PM_TRANS_EVT_SCRIPTLET_INFO, line, NULL); + } + fclose(pipe); + } + + while(waitpid(pid, &status, 0) == -1) { + if(errno != EINTR) { + _alpm_log(PM_LOG_ERROR, _("call to waitpid failed (%s)\n"), strerror(errno)); + retval = 1; + goto cleanup; + } + } + + /* report error from above after the child has exited */ + if(retval != 0) { + _alpm_log(PM_LOG_ERROR, _("could not open pipe (%s)\n"), strerror(errno)); + goto cleanup; + } + /* check the return status, make sure it is 0 (success) */ + if(WIFEXITED(status)) { + _alpm_log(PM_LOG_DEBUG, "call to waitpid succeeded\n"); + if(WEXITSTATUS(status) != 0) { + _alpm_log(PM_LOG_ERROR, _("command failed to execute correctly\n")); + retval = 1; } } } diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index b1d778e..5c8881c 100755 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -110,10 +110,13 @@ def generate(self): tmpdir = os.path.join(self.root, TMPDIR) logdir = os.path.join(self.root, os.path.dirname(LOGFILE)) etcdir = os.path.join(self.root, os.path.dirname(PACCONF)) - for dir in [dbdir, cachedir, syncdir, tmpdir, logdir, etcdir]: + bindir = os.path.join(self.root, "bin") + for dir in [dbdir, cachedir, syncdir, tmpdir, logdir, etcdir, bindir]: if not os.path.isdir(dir): vprint("\t%s" % dir[len(self.root)+1:]) os.makedirs(dir, 0755) + # Only the dynamically linked binary is needed for fakechroot + shutil.copy("/bin/sh", bindir) # Configuration file vprint(" Creating configuration file") -- 1.7.2.1

1 0

[pacman-dev] replaces vs conflicts
by Allan McRae 13 Aug '10

13 Aug '10

Has something changed in the handling of provides/conflicts/replaces. :: Synchronizing package databases... core 35.7K 30.4K/s 00:00:01 [######################] 100% extra 458.8K 52.5K/s 00:00:09 [######################] 100% community 380.4K 40.4K/s 00:00:09 [######################] 100% :: Starting full system upgrade... resolving dependencies... looking for inter-conflicts... :: elfutils and libelf are in conflict. Remove libelf? [y/N] > pacman -Si elfutils Repository : core Name : elfutils Version : 0.148-1 URL : https://fedorahosted.org/elfutils/ Licenses : GPL2 Groups : None Provides : libelf Depends On : glibc Optional Deps : None Conflicts With : libelf Replaces : libelf So the elfutils PKGBUILD has provides/conflicts/replaces=libelf. Didn't this use to replace the package rather than causing a conflict? Allan

3 9