May 2009 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Add support for the xz archive format
by Pierre Schmitz 19 May '09

19 May '09

This simple patch adds support for the xz archive format to makepkg and repo- add. Xz can be used as source, package and package db file type. Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> --- scripts/makepkg.sh.in | 5 +++++ scripts/repo-add.sh.in | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d978107..cc59f1b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -648,6 +648,8 @@ extract_sources() { cmd="gunzip -d -f $file" ;; *application/x-bzip*) cmd="bunzip2 -f $file" ;; + *application/x-xz*) + cmd="xz -d -f $file" ;; *) # Don't know what to use to extract this file, # skip to the next file @@ -979,6 +981,7 @@ create_package() { case "$PKGEXT" in *tar.gz) EXT=${PKGEXT%.gz} ;; *tar.bz2) EXT=${PKGEXT%.bz2} ;; + *tar.xz) EXT=${PKGEXT%.xz} ;; *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$PKGEXT" ; EXT=$PKGEXT ;; esac @@ -996,6 +999,7 @@ create_package() { case "$PKGEXT" in *tar.gz) gzip -f -n "$pkg_file" ;; *tar.bz2) bzip2 -f "$pkg_file" ;; + *tar.xz) xz -z -f "$pkg_file" ;; esac ret=$? fi @@ -1054,6 +1058,7 @@ create_srcpackage() { case "$SRCEXT" in *tar.gz) TAR_OPT="z" ;; *tar.bz2) TAR_OPT="j" ;; + *tar.xz) TAR_OPT="J" ;; *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$SRCEXT" ;; esac diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 2390a92..bbd41a2 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -462,6 +462,7 @@ if [ $success -eq 1 ]; then case "$REPO_DB_FILE" in *tar.gz) TAR_OPT="z" ;; *tar.bz2) TAR_OPT="j" ;; + *tar.xz) TAR_OPT="J" ;; *) warning "$(gettext "'%s' does not have a valid archive extension.")" \ "$REPO_DB_FILE" ;; esac -- 1.6.3 -- Pierre Schmitz Clemens-August-Straße 76 53115 Bonn Telefon 0228 9716608 Mobil 0160 95269831 Jabber pierre(a)jabber.archlinux.de WWW http://www.archlinux.de

3 6

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-165-g35b9dfc
by dan＠archlinux.org 19 May '09

19 May '09

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 35b9dfc3805821cb504231a5e5ce5a8694278fb7 (commit) via c301d6aa250620fda6b268e17e1b0dd41027e90b (commit) from 0bf340f73c1b1705ab9314955c931a83e15fecb3 (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 35b9dfc3805821cb504231a5e5ce5a8694278fb7 Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Tue May 12 00:45:18 2009 -0300 Remove unused included headers from testdb.c and testpkg.c libgen.h was used for basename() in function main() from src/util/testdb.c string.h was used for strlen() in function output_cb() from src/util/testpkg.c Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c301d6aa250620fda6b268e17e1b0dd41027e90b Author: Pierre Schmitz <pierre(a)archlinux.de> Date: Wed May 13 08:21:11 2009 +0200 Add support for the xz archive format This simple patch adds support for the xz archive format to makepkg and repo- add. Xz can be used as source, package and package db file type. Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> [Dan: fixed a few alignment issues] Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 5 +++++ scripts/repo-add.sh.in | 1 + src/util/testdb.c | 1 - src/util/testpkg.c | 1 - 4 files changed, 6 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-163-g0bf340f
by dan＠archlinux.org 19 May '09

19 May '09

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 0bf340f73c1b1705ab9314955c931a83e15fecb3 (commit) via 882bff36acad5c47df5b35fd3afb411dc4f092b0 (commit) via f89f7e136ba8d923680a6d0342d5e51d4fda1570 (commit) from 212ea8a9ed342efe2d74655cdebf668cc0cc7ce2 (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 0bf340f73c1b1705ab9314955c931a83e15fecb3 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat Apr 18 17:35:08 2009 +0200 Remove unused error codes and handle PM_ERR_RETRIEVE by alpm_strerror() Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 882bff36acad5c47df5b35fd3afb411dc4f092b0 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Mon Apr 13 15:08:38 2009 +0200 Remove find_replacements() "Foo replaces bar" simply means that "foo is a new version of bar". So this patch refactors the code to use this "rule". _alpm_sync_sysupgrade now does the following for each local package [bar] (pseudo-code): for db in syncdbs { if(db contains bar) {check if db/bar is an upgrade; break;} replacers = find(bar replacers in db); if(replacers!=NULL) {ask_user; break;} } Note: 1. Replacers are grouped per repo. If more than one package replace bar in a repo, all of them are considered ("package set of bar replacers"). 2. If repo1/foo1 and repo2/foo2 both replaces bar, only repo1/foo1 is considered (if repo1 stands before repo2 in pacman.conf). FS#11737 is fixed. 3. It can happen that pacman doesn't consider any replacer, if it found a literal "earlier", so sync132.py modified accordingly (btw, that situation should not appear irl). The new sysupgrade code doesn't use sync_newversion(), so I removed the "local is newer than repo" message, which was annoying with -Qu and SyncFirst. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f89f7e136ba8d923680a6d0342d5e51d4fda1570 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Thu May 14 16:15:20 2009 +0200 Query documentation updates The old documentation didn't emphasize our filtering options at all, and it was a bit misleading. ("List ALL...") I also clarified the description of -Qu. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/pacman.8.txt | 28 ++++--- lib/libalpm/alpm.h | 9 -- lib/libalpm/error.c | 17 +---- lib/libalpm/sync.c | 200 ++++++++++++++++++--------------------------- pactest/tests/sync132.py | 4 +- src/pacman/pacman.c | 10 +- 6 files changed, 106 insertions(+), 162 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Query documentation updates
by Nagy Gabor 19 May '09

19 May '09

>From 8f675582f8f0098ec524fa702c38058c687e53fd Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Thu, 14 May 2009 16:15:20 +0200 Subject: [PATCH] Query documentation updates The old documentation didn't emphasize our filtering options at all, and it was a bit misleading. ("List ALL...") I also clarified the description of -Qu. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- doc/pacman.8.txt | 28 +++++++++++++++++----------- src/pacman/pacman.c | 10 +++++----- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 37680be..4582be5 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -33,7 +33,10 @@ Operations packages and their files, as well as meta-information about individual packages (dependencies, conflicts, install date, build date, size). This can be run against the local package database or can be used on - individual '.tar.gz' packages. See <<QO,Query Options>> below. + individual '.tar.gz' packages. In the first case, if no package names + are provided in the command line, all installed packages will be + queried. Additionally, various filters can be applied on the package + list. See <<QO,Query Options>> below. *-R, \--remove*:: Remove a package from the system. Groups can also be specified to be @@ -164,16 +167,17 @@ Query Options[[QO]] it will be shown if available. *-d, \--deps*:: - List all packages installed as dependencies. This option can be combined - with '-t' for listing real orphans- packages that were installed as - dependencies but are no longer required by any installed package. ('-Qdt' - is equivalent to the pacman 3.0.X '-Qe' option.) + Restrict or filter output to packages installed as dependencies. This + option can be combined with '-t' for listing real orphans- packages that + were installed as dependencies but are no longer required by any + installed package. ('-Qdt' is equivalent to the pacman 3.0.X '-Qe' + option.) *-e, \--explicit*:: - List all packages explicitly installed. This option can be combined with - '-t' to list top-level packages- those packages that were explicitly - installed but are not required by any other package. ('-Qet' is equivalent - to the pacman 2.9.X '-Qe' option.) + Restrict or filter output to packages explicitly installed. This option + can be combined with '-t' to list top-level packages- those packages + that were explicitly installed but are not required by any other + package. ('-Qet' is equivalent to the pacman 2.9.X '-Qe' option.) *-g, \--groups*:: Display all packages that are members of a named group. If a name is not @@ -221,8 +225,10 @@ Query Options[[QO]] installed package. *-u, \--upgrades*:: - Lists all packages that are out of date on the local system. This option - works best if the sync database is refreshed using '-Sy'. + Restrict or filter output to packages that are out of date on the local + system. (Only package versions are used to find outdated packages, + replacements are not checked here.) This option works best if the sync + database is refreshed using '-Sy'. Remove Options[[RO]] diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 14cfdfa..72a72ba 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -103,17 +103,17 @@ static void usage(int op, const char * const myname) printf("%s: %s {-Q --query} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg); printf("%s:\n", str_opt); printf(_(" -c, --changelog view the changelog of a package\n")); - printf(_(" -d, --deps list all packages installed as dependencies\n")); - printf(_(" -e, --explicit list all packages explicitly installed\n")); + printf(_(" -d, --deps list packages installed as dependencies [filter]\n")); + printf(_(" -e, --explicit list packages explicitly installed [filter]\n")); printf(_(" -g, --groups view all members of a package group\n")); printf(_(" -i, --info view package information (-ii for backup files)\n")); printf(_(" -l, --list list the contents of the queried package\n")); - printf(_(" -m, --foreign list installed packages not found in sync db(s)\n")); + printf(_(" -m, --foreign list installed packages not found in sync db(s) [filter]\n")); printf(_(" -o, --owns <file> query the package that owns <file>\n")); printf(_(" -p, --file <package> query a package file instead of the database\n")); printf(_(" -s, --search <regex> search locally-installed packages for matching strings\n")); - printf(_(" -t, --unrequired list all packages not required by any package\n")); - printf(_(" -u, --upgrades list all outdated packages\n")); + printf(_(" -t, --unrequired list packages not required by any package [filter]\n")); + printf(_(" -u, --upgrades list outdated packages [filter]\n")); printf(_(" -q, --quiet show less information for query and search\n")); } else if(op == PM_OP_SYNC) { printf("%s: %s {-S --sync} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg); -- 1.6.0.3

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-160-g212ea8a
by dan＠archlinux.org 19 May '09

19 May '09

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 212ea8a9ed342efe2d74655cdebf668cc0cc7ce2 (commit) via a812ad4ea4faeb5cb229a574adef47764840f890 (commit) via 1bbb34365c437ebdf85874f39474bce37c4b7144 (commit) via 1d8d932fa65d920ab4d43d90f3227c17714f4f14 (commit) via 783e710839d6de059b95e8ed117bdcee1233720f (commit) via c5d9b999c76dceb077d5d5332b440a12698e8519 (commit) via 4a582fac2a24b6fca170721ec7adcca9239457ff (commit) via 86cd72573b03297044112e50a88bd651190aa284 (commit) via 80caeabce0f28125f3b68388996ce39e58f2e5e8 (commit) via 250e66e57b6a187b5643ea6db088552e4efef488 (commit) via 5e32928a42366fd3df27ffe108b44fcfe35617dd (commit) via de44a0f474f4e78359b890644645bd7e153983d2 (commit) from 20017354f7ccb58bf4f78691985a5d237f4dbc90 (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 212ea8a9ed342efe2d74655cdebf668cc0cc7ce2 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Tue May 12 11:01:58 2009 +0200 repo-add: fix -n tests which are applicable only to strings Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a812ad4ea4faeb5cb229a574adef47764840f890 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Tue May 12 11:09:11 2009 +0200 libarchive development has moved to Google Code Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1bbb34365c437ebdf85874f39474bce37c4b7144 Author: Dan McGee <dan(a)archlinux.org> Date: Mon May 18 23:00:16 2009 -0500 Add pyc files to autoclean Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1d8d932fa65d920ab4d43d90f3227c17714f4f14 Author: Dan McGee <dan(a)archlinux.org> Date: Mon May 18 22:59:54 2009 -0500 Remove recursive remove in autoclean.sh Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 783e710839d6de059b95e8ed117bdcee1233720f Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Tue May 12 12:54:49 2009 -0300 Add more files to cleanup in autoclean.sh Add files pactest/tests/Makefile.in , pactest/tests/Makefile and contrib/Makefile.in , contrib/Makefile to list of cleanup script. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c5d9b999c76dceb077d5d5332b440a12698e8519 Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Tue May 12 13:04:11 2009 -0300 Add repo-remove.8 to list of cleanup in doc/Makefile.am repo-remove.8 is generated with Makefile but is not removed on clean. This patch add it to list of untracked autoconf files. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4a582fac2a24b6fca170721ec7adcca9239457ff Merge: 86cd72573b03297044112e50a88bd651190aa284 80caeabce0f28125f3b68388996ce39e58f2e5e8 Author: Dan McGee <dan(a)archlinux.org> Date: Mon May 18 22:51:25 2009 -0500 Merge commit 'allan/working' commit 86cd72573b03297044112e50a88bd651190aa284 Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Mon May 18 01:56:06 2009 -0300 Add an initial pactest/test/.gitignore Add an initial pactest/test/.gitignore to exclude sync200.py that is generated from sync200.py.in Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 80caeabce0f28125f3b68388996ce39e58f2e5e8 Author: Allan McRae <allan(a)archlinux.org> Date: Sat May 16 14:39:18 2009 +1000 NEWS file updates for makepkg and contrib Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 250e66e57b6a187b5643ea6db088552e4efef488 Author: Allan McRae <allan(a)archlinux.org> Date: Sat May 16 13:48:10 2009 +1000 makepkg: fix sourcing BUILDSCRIPT and PATH issues The bash source command looks in the users PATH for the file to source before the local directory. This causes issues when someone has a PKGBUILD somewhere in their path (for unknown some reason...). Fixes FS#14727. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5e32928a42366fd3df27ffe108b44fcfe35617dd Author: Allan McRae <allan(a)archlinux.org> Date: Mon May 11 01:16:51 2009 +1000 makepkg: Document package splitting Signed-off-by: Allan McRae <allan(a)archlinux.org> commit de44a0f474f4e78359b890644645bd7e153983d2 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Apr 26 19:52:29 2009 +1000 makepkg: do not update pkgver when building source package When making a source package for a SCM PKGBUILD, makepkg should not update the pkgver/pkgrel. Noted in FS#14456. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: INSTALL | 2 +- NEWS | 20 ++++++++++++++++ autoclean.sh | 57 ++++++++++++++++++++++++--------------------- doc/Makefile.am | 2 +- doc/PKGBUILD.5.txt | 27 +++++++++++++++++----- doc/makepkg.8.txt | 6 ++-- pactest/tests/.gitignore | 1 + scripts/makepkg.sh.in | 18 +++++++------- scripts/repo-add.sh.in | 4 +- 9 files changed, 88 insertions(+), 49 deletions(-) create mode 100644 pactest/tests/.gitignore hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 2/3] repo-add: fix -n tests which are applicable only to strings
by Cedric Staniewski 19 May '09

19 May '09

Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- scripts/repo-add.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 13097df..eb8837c 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -245,8 +245,8 @@ db_write_entry() echo -e "%VERSION%\n$pkgver\n" >>desc [ -n "$pkgdesc" ] && echo -e "%DESC%\n$pkgdesc\n" >>desc write_list_entry "GROUPS" "$_groups" "desc" - [ -n $csize ] && echo -e "%CSIZE%\n$csize\n" >>desc - [ -n $size ] && echo -e "%ISIZE%\n$size\n" >>desc + [ -n "$csize" ] && echo -e "%CSIZE%\n$csize\n" >>desc + [ -n "$size" ] && echo -e "%ISIZE%\n$size\n" >>desc # compute checksums msg2 "$(gettext "Computing md5 checksums...")" -- 1.6.3

2 1

[pacman-dev] [PATCH] libarchive development has moved to Google Code
by Cedric Staniewski 19 May '09

19 May '09

Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- INSTALL | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/INSTALL b/INSTALL index 3127cd3..f9989d5 100644 --- a/INSTALL +++ b/INSTALL @@ -14,7 +14,7 @@ You will need to build and install two libraries before you can properly build pacman. libarchive -http://people.freebsd.org/~kientzle/libarchive/ +http://code.google.com/p/libarchive/ libfetch ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/net/libfetch/README.html -- 1.6.3

2 1

[pacman-dev] [PATCH] Add repo-remove.8 to list of cleanup in doc/Makefile.am
by Gerardo Exequiel Pozzi 19 May '09

19 May '09

repo-remove.8 is generated with Makefile but is not removed on clean. This patch add it to list of untracked autoconf files. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- doc/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index a796a91..4703b63 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -51,7 +51,7 @@ EXTRA_DIST = \ $(DOXYGEN_MANS) # Files that should be removed, but which Automake does not know. -MOSTLYCLEANFILES = *.xml $(ASCIIDOC_MANS) $(HTML_DOCS) +MOSTLYCLEANFILES = *.xml $(ASCIIDOC_MANS) $(HTML_DOCS) repo-remove.8 # Ensure manpages are fresh when building a dist tarball dist-hook: -- 1.6.3

2 1

[pacman-dev] [PATCH] makepkg: fix sourcing BUILDSCRIPT and PATH issues
by Allan McRae 19 May '09

19 May '09

The bash source command looks in the users PATH for the file to source before the local directory. This causes issues when someone has a PKGBUILD somewhere in their path (for unknown some reason...). Fixes FS#14727. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index fefcc73..f94f925 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1527,6 +1527,7 @@ if [ ! -f "$BUILDSCRIPT" ]; then else # PKGBUILD passed through a pipe BUILDSCRIPT=/dev/stdin + source "$BUILDSCRIPT" fi else crlftest=$(file $BUILDSCRIPT | grep -F 'CRLF' || true) @@ -1534,9 +1535,9 @@ else error "$(gettext "%s contains CRLF characters and cannot be sourced.")" "$BUILDSCRIPT" exit 1 fi -fi -source "$BUILDSCRIPT" + source ./"$BUILDSCRIPT" +fi if [ "$GENINTEG" -eq 1 ]; then mkdir -p "$srcdir" -- 1.6.3.1

2 1

[pacman-dev] [PATCH 1/2] Introduce PM_TRANS_FLAG_NOLOCK
by Nagy Gabor 19 May '09

19 May '09

From afa07db77af2896b407b24c6ef69bb19f6b80417 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat, 16 May 2009 16:54:21 +0200 Subject: [PATCH 1/2] Introduce PM_TRANS_FLAG_NOLOCK This flag indicates that the front-end will not call alpm_trans_commit(), so the database needn't be locked. This is the first step toward fixing FS#8905. If this flag is set, alpm_trans_commit() does nothing and returns with an error (that has new code: PM_ERR_TRANS_NOT_LOCKED). Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/alpm.h | 4 +++- lib/libalpm/error.c | 2 ++ lib/libalpm/trans.c | 32 ++++++++++++++++++++------------ 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 2a6c2e0..1e22a59 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -276,7 +276,8 @@ typedef enum _pmtransflag_t { PM_TRANS_FLAG_NEEDED = 0x2000, PM_TRANS_FLAG_ALLEXPLICIT = 0x4000, PM_TRANS_FLAG_UNNEEDED = 0x8000, - PM_TRANS_FLAG_RECURSEALL = 0x10000 + PM_TRANS_FLAG_RECURSEALL = 0x10000, + PM_TRANS_FLAG_NOLOCK = 0x20000 } pmtransflag_t; /** @@ -487,6 +488,7 @@ enum _pmerrno_t { PM_ERR_TRANS_NOT_PREPARED, PM_ERR_TRANS_ABORT, PM_ERR_TRANS_TYPE, + PM_ERR_TRANS_NOT_LOCKED, /* Packages */ PM_ERR_PKG_NOT_FOUND, PM_ERR_PKG_IGNORED, diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 47f0750..fdff9ed 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -99,6 +99,8 @@ const char SYMEXPORT *alpm_strerror(int err) return _("transaction aborted"); case PM_ERR_TRANS_TYPE: return _("operation not compatible with the transaction type"); + case PM_ERR_TRANS_NOT_LOCKED: + return _("transaction commit attempt when database is not locked"); /* Packages */ case PM_ERR_PKG_NOT_FOUND: return _("could not find or read package"); diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index b144b2a..6e74f3f 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -71,9 +71,11 @@ int SYMEXPORT alpm_trans_init(pmtranstype_t type, pmtransflag_t flags, ASSERT(handle->trans == NULL, RET_ERR(PM_ERR_TRANS_NOT_NULL, -1)); /* lock db */ - handle->lckfd = _alpm_lckmk(); - if(handle->lckfd == -1) { - RET_ERR(PM_ERR_HANDLE_LOCK, -1); + if(!(flags & PM_TRANS_FLAG_NOLOCK)) { + handle->lckfd = _alpm_lckmk(); + if(handle->lckfd == -1) { + RET_ERR(PM_ERR_HANDLE_LOCK, -1); + } } handle->trans = _alpm_trans_new(); @@ -158,6 +160,8 @@ int SYMEXPORT alpm_trans_commit(alpm_list_t **data) ASSERT(handle->trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(handle->trans->state == STATE_PREPARED, RET_ERR(PM_ERR_TRANS_NOT_PREPARED, -1)); + ASSERT(!(handle->trans->flags & PM_TRANS_FLAG_NOLOCK), RET_ERR(PM_ERR_TRANS_NOT_LOCKED, -1)); + return(_alpm_trans_commit(handle->trans, data)); } @@ -199,19 +203,23 @@ int SYMEXPORT alpm_trans_release() ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(trans->state != STATE_IDLE, RET_ERR(PM_ERR_TRANS_NULL, -1)); + int nolock_flag = trans->flags & PM_TRANS_FLAG_NOLOCK; + _alpm_trans_free(trans); handle->trans = NULL; /* unlock db */ - if(handle->lckfd != -1) { - while(close(handle->lckfd) == -1 && errno == EINTR); - handle->lckfd = -1; - } - if(_alpm_lckrm()) { - _alpm_log(PM_LOG_WARNING, _("could not remove lock file %s\n"), - alpm_option_get_lockfile()); - alpm_logaction("warning: could not remove lock file %s\n", - alpm_option_get_lockfile()); + if(!nolock_flag) { + if(handle->lckfd != -1) { + while(close(handle->lckfd) == -1 && errno == EINTR); + handle->lckfd = -1; + } + if(_alpm_lckrm()) { + _alpm_log(PM_LOG_WARNING, _("could not remove lock file %s\n"), + alpm_option_get_lockfile()); + alpm_logaction("warning: could not remove lock file %s\n", + alpm_option_get_lockfile()); + } } return(0); -- 1.6.3.1

2 1