- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.1-18-gda933c2
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, master has been updated via da933c223eedb66c51b4a48b6ab0ce8fcb344b5c (commit) from 1c47500ea6d41bf9354155fca2e7c83fca368e1d (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 da933c223eedb66c51b4a48b6ab0ce8fcb344b5c Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 2 12:27:32 2008 -0500 Remove unnecessary initialization in new functions We don't need to zero things out, we are already using calloc for this purpose. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/handle.c | 9 --------- lib/libalpm/trans.c | 9 --------- src/pacman/conf.c | 4 ---- 3 files changed, 0 insertions(+), 22 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] ALPM & PackageKit
by Georg Grabler 03 Sep '08

03 Sep '08

Hey guys, I've some concerns. I also posted quite a similar thing to the dev~ list of PackageKit, and I'll also try to get some information in IRC lateron. First of all, as you might know, the Shaman devs (drf and boom) would like to switch to packagekit with version 2 of Shaman. Therefore, I looked at the implementation of the ALPM backend in PackageKit (developed by onestep). As it seems, all operations which at least require a synchronisation, or download functionality, are missing in the backend implementation. The reason: PackageKit has no functionality to supply server or configuration parameters to the backend library (interfaces missing). Now, since ALPM does not read any config files (I basically think it's the right way that the frontends have their own config management), I'd like to know before I talk again with the PK maintainers what ALPM would need for all "standard" operations (see chart at http://www.packagekit.org/pk-matrix.html) In between: ALPM has improved a lot ("helpful" functions) since I looked at it the last time. Nice job. Kind regards, Georg

2 2

Re: [pacman-dev] [arch-dev-public] Xorg-server 1.5RC6 enters testing
by Xavier 02 Sep '08

02 Sep '08

On Mon, Sep 1, 2008 at 2:23 AM, Allan McRae <allan(a)archlinux.org> wrote: > > After upgrading, X failed to start with a message about libpciaccess. > Installing that fixed the problem... Is this a missing dep somewhere? > The dep is not missing, so this might be a pacman bug.. http://bugs.archlinux.org/task/11367 To anyone who did not upgrade yet to the latest xorg-server (currently in testing) : Please check that when you upgrade, libpciaccess is indeed in the target list. If anyone sees that it is missing, canceling the operation and running it again with --debug would be very helpful.

1 2

[pacman-dev] GIT 2008 User Survey
by Dan McGee 02 Sep '08

02 Sep '08

Hey guys, Since our project uses git, I thought I'd point out the 2008 GIT user survey that is currently going on: http://www.survs.com/survey?id=M3PIVU72&channel=2WXE4BVTW8 I'm sure they would appreciate our input, whether you are a developer that fully understands GIT, or just a lurker that keeps up with pacman development. -Dan

3 2

[pacman-dev] makepkg 3.2.1 testing
by Xavier 28 Aug '08

28 Aug '08

Hello, while pacman 3.2.0 release was quite good, makepkg one was a bit worse. I think the main cause is the lack of testing. I personally always use the devel versions of pacman and makepkg, but I use pacman daily, while I only use makepkg very irregularly. Anyway, the 3.2.1 release is close now, and all known makepkg bugs were fixed : - fix download functions with weird URLs (FS#11076) - fix creation of source package with local files (FS#11149) - fix error when sourcing profile scripts (FS#11179) - perform case-insensitive checksum comparison (FS#11283) For FS#11292 (handling multiple source files which have the same name), a new feature had to be introduced. it is now possible to use the filename of your choice for remote sources, like this : source=('filename::http://path/to/file') This allows to handle multiple source files with same name, and also to handle more nicely weird URLs like http://www.vim.org/scripts/download_script.php?src_id=6992. So if some of the intensive makepkg users could just grab this pre 3.2.1 release and simply check everything is still fine with their PKGBUILDs, or more specifically check that all the bugs mentioned here are fixed, or that the new filename feature correctly, that would be great. Simply gunzip the attached file, and either run it directly from where you extracted it, or put it somewhere in your path.

2 3