- Pacman-dev - lists.archlinux.org

[pacman-dev] Show total progress bar
by Nathan Jones 28 Sep '08

28 Sep '08

Hey folks, Message about the TotalDownload option from way back in November 07: http://archlinux.org/pipermail/pacman-dev/2007-November/009948.html Back then, I did not know how to draw two progress bars. Well, now I have figured it out (and it only took ten months, not bad). I have a really terrible patch right now which somewhat works. If everyone thinks that having two progress bars is a good thing, then I will make a better patch. I don't know if it is a good thing or not. The output is a bit overwhelming, but it is fun to look at. To see what having two bars would look like without having to apply the patch, try this python script: import sys import time print 'pacman [###-------] 25%' print 'total [##--------] 10%', sys.stdout.flush() time.sleep(1) sys.stdout.write('\033[A\033[K\n\033[K\r\033[A') print 'pacman [#########-] 90%' print 'total [#####-----] 50%', sys.stdout.flush() time.sleep(1) sys.stdout.write('\033[A\033[K\n\033[K\r\033[A') print 'pacman [##########] 100%' print 'gcc [##--------] 10%' print 'total [######----] 60%', sys.stdout.flush() time.sleep(1) sys.stdout.write('\033[A\033[K\n\033[K\r\033[A') print 'gcc [######----] 60%' print 'total [########--] 80%', sys.stdout.flush() time.sleep(1) sys.stdout.write('\033[A\033[K\n\033[K\r\033[A') print 'gcc [########--] 80%' print 'total [#########-] 90%', sys.stdout.flush() time.sleep(1) sys.stdout.write('\033[A\033[K\n\033[K\r\033[A') print 'gcc [##########] 100%' print 'total [##########] 100%'

2 2

[pacman-dev] possible bug?
by Roman Kyrylych 28 Sep '08

28 Sep '08

Hi! Stumbled upon this today: http://bugs.archlinux.org/task/11498 Can this be somehow related to the fact that Pacman doesn't store ownership of directories? -- Roman Kyrylych (Роман Кирилич)

1 0

[pacman-dev] [PATCH] makepkg: Add used options to PKGINFO file
by Allan McRae 27 Sep '08

27 Sep '08

Adds defined options to the PKGINFO file in the form of "makepkgopt =". It may be useful to be able to add these to the pacman DB at some point as that would allow (e.g.) checking which packages have had their docs striped (FS#7092). Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c15d91f..f5a5af4 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -41,8 +41,9 @@ confdir='@sysconfdir@' startdir="$PWD" srcdir="$startdir/src" pkgdir="$startdir/pkg" -known_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'ccache' 'distcc' 'makeflags' 'force') -readonly -a known_options +packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman') +other_options=('ccache' 'distcc' 'makeflags' 'force') +readonly -a packaging_options other_options # Options ASROOT=0 @@ -844,6 +845,16 @@ create_package() { for it in "${backup[@]}"; do echo "backup = $it" >>.PKGINFO done + for it in "${packaging_options[@]}"; do + local ret="$(check_option $it)" + if [ "$ret" != "?" ]; then + if [ "$ret" = "y" ]; then + echo "makepkgopt = $it" >>.PKGINFO + else + echo "makepkgopt = !$it" >>.PKGINFO + fi + fi + done # TODO maybe remove this at some point # warn if license array is not present or empty @@ -1385,7 +1396,7 @@ valid_options=1 for opt in ${options[@]}; do known=0 # check if option matches a known option or its inverse - for kopt in ${known_options[@]}; do + for kopt in ${packaging_options[@]} ${other_options[@]}; do if [ "${opt}" = "${kopt}" -o "${opt}" = "!${kopt}" ]; then known=1 fi -- 1.6.0.2

1 1

Re: [pacman-dev] handling info files
by Miklos Vajna 21 Sep '08

21 Sep '08

On Sun, Sep 21, 2008 at 08:43:17PM +1000, Allan McRae <allan(a)archlinux.org> wrote: > Yes, but the compressing of info pages is only on the master branch. There > is no automatic removing of the dir file but that would require hard-coding > a file name into makepkg which I am not too sure about... I don't exaclty know how you can do it with your KISS way, but we have a (you can call it distro-specific) install macro that already does stuff like removing perl's perllocal.pod/.packlist files, etc. That macro takes care of removing such info dirs as well.

1 0

[pacman-dev] handling info files
by Andreas Radke 21 Sep '08

21 Sep '08

Now that we decided that we want to ship info documentation we should decide how to package such files: info files could be gzipped by makepkg or stay uncompressed. On my system they already take quiet a lot of space compared to much more packages shipping man-pages: [root@workstation64 andyrtr]# du -ch /usr/share/info/ 21M /usr/share/info/ [root@workstation64 andyrtr]# du -sch /usr/share/man 61M /usr/share/man Some are really big like gcc.info being 1.8mb uncompressed. I vote for auto-gzipping the info pages like man-pages. And shouldn't we check and remove the $pkgdir/usr/share/info/dir file that every pkg with info files produces? Maybe we can also print at the end of the makepkg run an array of found info files the packager should put into the *.install file. Right now we use the proto-info.install shipped with the "abs" pkg. An automated solution would be also nice for that. Opinions? -Andy

4 3

[pacman-dev] problem with deltas file generated by repo-add and what _alpm_delta_parse expects
by solsTiCe d'Hiver 14 Sep '08

14 Sep '08

hi. i browse into alpm code, and just find that repo-add adds lines like that to a deltas file $fromver $tover $deltasize $deltafile $deltamd5 but _alpm_delta_parse (in delta.c) which is used in be_files.c, expect the same line to be $oldfile $oldmd5 $newfile $newmd5 $deltafile $deltamd5 $deltasize is it because this delta stuff is not finished yet ? or i am simply completly wrong ?? by the way, i am trying to create a bsd db4 back-end for alpm. i have written convert.c, rewritten repo.add.py.in, pmdb.py. i have to rewrite be_files.c yet, the big part. what do you, the dev, think of that ? i know that almost every one was against such a thing some time ago, and might still do. i do it mostly as an exercise but it would be nice if it is used. cheers

1 0

[pacman-dev] [PATCH] libalpm: handle syscall interruption correctly
by Dan McGee 10 Sep '08

10 Sep '08

It is possible to throw EINTR from a system call such as open(), close(), or waitpid() if custom signal handlers are set up and they are not initialized with the SA_RESTART flag. This was noticed by Andreas Radke when ^C (SIGINT) was given during the call to waitpid(), causing it to throw the EINTR error and we could not accommodate it. Simply wrap these calls in a simple loop that allows us to retry the call if interrupted. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- This patch should probably be considered for maint. It seems to work correctly in the normal case, although I have not reproduced it by trying to issue a SIGINT during the system call itself, which could be tricky. As a side note, our signal handlers are not async-safe at all and should probably be looked at sometime. -Dan lib/libalpm/trans.c | 5 ++--- lib/libalpm/util.c | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index d233645..73ae822 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -30,7 +30,6 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/statvfs.h> -#include <unistd.h> #include <errno.h> /* libalpm */ @@ -205,7 +204,7 @@ int SYMEXPORT alpm_trans_release() /* unlock db */ if(handle->lckfd != -1) { - close(handle->lckfd); + while(close(handle->lckfd) == -1 && errno == EINTR); handle->lckfd = -1; } if(_alpm_lckrm()) { @@ -567,7 +566,7 @@ int _alpm_runscriptlet(const char *root, const char *installfn, /* this code runs for the parent only (wait on the child) */ pid_t retpid; int status; - retpid = waitpid(pid, &status, 0); + while((retpid = waitpid(pid, &status, 0)) == -1 && errno == EINTR); if(retpid == -1) { _alpm_log(PM_LOG_ERROR, _("call to waitpid failed (%s)\n"), strerror(errno)); diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index b26c970..da3463b 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -254,7 +254,8 @@ int _alpm_lckmk() _alpm_makepath(dir); FREE(dir); - fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000); + while((fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000)) == -1 + && errno == EINTR); return(fd > 0 ? fd : -1); } -- 1.6.0.1

1 1

[pacman-dev] [PATCH] makepkg: allow compression type to be autodetected
by Dan McGee 05 Sep '08

05 Sep '08

Inspired by commit 7e8f1469c4168875b54956d63884b8583ce99e38, use our given PKGEXT or SRCEXT to determine what method of compression to use on the package we create. If the extension is invalid, this should fall back to creating a non-compressed tar file. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/makepkg.sh.in | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index c15d91f..ff05e48 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -871,13 +871,21 @@ create_package() { # tar it up msg2 "$(gettext "Compressing package...")" + local TAR_OPT + case "$PKGEXT" in + *tar.gz) TAR_OPT="z" ;; + *tar.bz2) TAR_OPT="j" ;; + *) warning "$(gettext "'%s' is not a valid archive extension.")" \ + "$PKGEXT" ;; + esac + local pkg_file="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" # when fileglobbing, we want * in an empty directory to expand to # the null string rather than itself shopt -s nullglob - if ! bsdtar -czf "$pkg_file" $comp_files *; then + if ! bsdtar -c${TAR_OPT}f "$pkg_file" $comp_files *; then error "$(gettext "Failed to create package file.")" exit 1 # TODO: error code fi @@ -992,12 +1000,20 @@ create_srcpackage() { fi done + local TAR_OPT + case "$SRCEXT" in + *tar.gz) TAR_OPT="z" ;; + *tar.bz2) TAR_OPT="j" ;; + *) warning "$(gettext "'%s' is not a valid archive extension.")" \ + "$SRCEXT" ;; + esac + local pkg_file="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}${SRCEXT}" # tar it up msg2 "$(gettext "Compressing source package...")" cd "${srclinks}" - if ! bsdtar -czLf "$pkg_file" ${pkgname}; then + if ! bsdtar -c${TAR_OPT}Lf "$pkg_file" ${pkgname}; then error "$(gettext "Failed to create source package file.")" exit 1 # TODO: error code fi -- 1.6.0.1

4 5

[pacman-dev] [PATCH] Rework fakechroot checking
by Dan McGee 05 Sep '08

05 Sep '08

Do the checks in the tests that need it, and get rid of some of the cluttered output when it is not available (one line per test run). Signed-off-by: Dan McGee <dan(a)archlinux.org> --- pactest/pmtest.py | 4 +--- pactest/tests/scriptlet001.py | 4 ++++ pactest/tests/scriptlet002.py | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pactest/pmtest.py b/pactest/pmtest.py index 39f4dea..7bb3281 100755 --- a/pactest/pmtest.py +++ b/pactest/pmtest.py @@ -197,9 +197,7 @@ class pmtest: cmd.append("fakeroot") fakechroot = which("fakechroot") - if not fakechroot: - print "WARNING: fakechroot not found, scriptlet tests WILL fail!!!" - else: + if fakechroot: cmd.append("fakechroot") if pacman["gdb"]: diff --git a/pactest/tests/scriptlet001.py b/pactest/tests/scriptlet001.py index 54a46aa..ff7fcd2 100644 --- a/pactest/tests/scriptlet001.py +++ b/pactest/tests/scriptlet001.py @@ -14,3 +14,7 @@ self.args = "--debug -U %s" % p1.filename() self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_OUTPUT=" + pre) self.addrule("PACMAN_OUTPUT=" + post) + +fakechroot = which("fakechroot") +if not fakechroot: + self.expectfailure = True diff --git a/pactest/tests/scriptlet002.py b/pactest/tests/scriptlet002.py index dd792b8..cc316a1 100644 --- a/pactest/tests/scriptlet002.py +++ b/pactest/tests/scriptlet002.py @@ -14,3 +14,7 @@ self.args = "--debug -R %s" % p1.name self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_OUTPUT=" + pre) self.addrule("PACMAN_OUTPUT=" + post) + +fakechroot = which("fakechroot") +if not fakechroot: + self.expectfailure = True -- 1.6.0.1

2 1

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.1-2-g242e9e9
by dan＠archlinux.org 05 Sep '08

05 Sep '08

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 242e9e90f4190b9f770a0230e99d302f7ec53e70 (commit) via 95ea6fb3c19a8d72d5b2e71ab5e37f2da8c77d5d (commit) from afac773d1936cbd0ea18ea94155f21dcf9411fb7 (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 242e9e90f4190b9f770a0230e99d302f7ec53e70 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Fri Aug 29 17:24:34 2008 +0200 Another attempt at fixing totaldownload. This fixes FS#11339, which is a regression of commit 89c2c5196: When totaldownload is enabled, the database downloading percent (-Sy) is always at 0. That is because we have no guarantee that the totaldownload callback was called by libalpm. In particular, it is not called (and it would not make sense to) when a single file is downloaded, like it is the case with databases. So the correct way to detect if totaldownload should be used is checking both config->totaldownload and list_total, like it was already done in several places in the cb_dl_progress function. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 95ea6fb3c19a8d72d5b2e71ab5e37f2da8c77d5d Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Aug 28 20:55:26 2008 +0200 Separate targets on -Qi/-Si with a newline. This fixes FS#11331 The newline was lost with commit 9451b2e4f23a3c566fcfe3420c379b3cb3eb1f90. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> ----------------------------------------------------------------------- Summary of changes: src/pacman/callback.c | 24 ++++++++++++++++-------- src/pacman/package.c | 4 +++- 2 files changed, 19 insertions(+), 9 deletions(-) hooks/post-receive -- The official pacman repository

1 0