- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] db->pkgcache_loaded and db->grpcache_loaded
by Nagy Gabor 10 Jan '09

10 Jan '09

>From e00884ab554562fa5e6ac601aa99477e0f70cd75 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat, 10 Jan 2009 16:25:03 +0100 Subject: [PATCH] db->pkgcache_loaded and db->grpcache_loaded Clearly the old code was more elegant (NULL cache indicated "not loaded"), but it had some drawbacks, so from now on we indicate the state of caches explicitly. Old drawbacks: When we had an empty database (unstable), libalpm called db_populate after every pkgcache access, because NULL pkgcache indicated "not loaded" state. This is not a common case, but the same situation can happen with grpcache, which is more problematic: If the user had a custom repo with no groups, grpcache was always NULL. (grpcache is also loaded per database.) Thus every get_grpcache call induced a load_grpcache operation, so the benefits of grpcache was completely lost. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/cache.c | 31 ++++++++++++++++--------------- lib/libalpm/db.h | 2 ++ 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/lib/libalpm/cache.c b/lib/libalpm/cache.c index 1085779..8d18f3e 100644 --- a/lib/libalpm/cache.c +++ b/lib/libalpm/cache.c @@ -54,6 +54,7 @@ int _alpm_db_load_pkgcache(pmdb_t *db) return(-1); } + db->pkgcache_loaded = 1; return(0); } @@ -61,7 +62,7 @@ void _alpm_db_free_pkgcache(pmdb_t *db) { ALPM_LOG_FUNC; - if(db == NULL || db->pkgcache == NULL) { + if(db == NULL || !db->pkgcache_loaded) { return; } @@ -71,10 +72,9 @@ void _alpm_db_free_pkgcache(pmdb_t *db) alpm_list_free_inner(db->pkgcache, (alpm_list_fn_free)_alpm_pkg_free); alpm_list_free(db->pkgcache); db->pkgcache = NULL; + db->pkgcache_loaded = 0; - if(db->grpcache) { - _alpm_db_free_grpcache(db); - } + _alpm_db_free_grpcache(db); } alpm_list_t *_alpm_db_get_pkgcache(pmdb_t *db) @@ -85,13 +85,13 @@ alpm_list_t *_alpm_db_get_pkgcache(pmdb_t *db) return(NULL); } - if(!db->pkgcache) { + if(!db->pkgcache_loaded) { _alpm_db_load_pkgcache(db); } /* hmmm, still NULL ?*/ if(!db->pkgcache) { - _alpm_log(PM_LOG_DEBUG, "error: pkgcache is NULL for db '%s'\n", db->treename); + _alpm_log(PM_LOG_DEBUG, "warning: pkgcache is NULL for db '%s'\n", db->treename); } return(db->pkgcache); @@ -104,7 +104,7 @@ int _alpm_db_add_pkgincache(pmdb_t *db, pmpkg_t *pkg) ALPM_LOG_FUNC; - if(db == NULL || pkg == NULL) { + if(db == NULL || !db->pkgcache_loaded || pkg == NULL) { return(-1); } @@ -139,7 +139,7 @@ int _alpm_db_remove_pkgfromcache(pmdb_t *db, pmpkg_t *pkg) ALPM_LOG_FUNC; - if(db == NULL || pkg == NULL) { + if(db == NULL || !db->pkgcache_loaded || pkg == NULL) { return(-1); } @@ -172,7 +172,7 @@ pmpkg_t *_alpm_db_get_pkgfromcache(pmdb_t *db, const char *target) alpm_list_t *pkgcache = _alpm_db_get_pkgcache(db); if(!pkgcache) { - _alpm_log(PM_LOG_DEBUG, "error: failed to get '%s' from NULL pkgcache\n", + _alpm_log(PM_LOG_DEBUG, "warning: failed to get '%s' from NULL pkgcache\n", target); return(NULL); } @@ -192,10 +192,6 @@ int _alpm_db_load_grpcache(pmdb_t *db) return(-1); } - if(db->pkgcache == NULL) { - _alpm_db_load_pkgcache(db); - } - _alpm_log(PM_LOG_DEBUG, "loading group cache for repository '%s'\n", db->treename); @@ -230,6 +226,7 @@ int _alpm_db_load_grpcache(pmdb_t *db) } } + db->grpcache_loaded = 1; return(0); } @@ -239,15 +236,19 @@ void _alpm_db_free_grpcache(pmdb_t *db) ALPM_LOG_FUNC; - if(db == NULL || db->grpcache == NULL) { + if(db == NULL || !db->grpcache_loaded) { return; } + _alpm_log(PM_LOG_DEBUG, "freeing group cache for repository '%s'\n", + db->treename); + for(lg = db->grpcache; lg; lg = lg->next) { _alpm_grp_free(lg->data); lg->data = NULL; } FREELIST(db->grpcache); + db->grpcache_loaded = 0; } alpm_list_t *_alpm_db_get_grpcache(pmdb_t *db) @@ -258,7 +259,7 @@ alpm_list_t *_alpm_db_get_grpcache(pmdb_t *db) return(NULL); } - if(db->grpcache == NULL) { + if(!db->grpcache_loaded) { _alpm_db_load_grpcache(db); } diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 25b90b5..55f5cd5 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -42,7 +42,9 @@ struct __pmdb_t { char *path; char *treename; void *handle; + int pkgcache_loaded; alpm_list_t *pkgcache; + int grpcache_loaded; alpm_list_t *grpcache; alpm_list_t *servers; }; -- 1.6.0.3

1 0

[pacman-dev] [PATCH] makepkg : fix a lot of breakages caused by Allan
by Dan McGee 08 Jan '09

08 Jan '09

From: Xavier Chantry <shiningxc(a)gmail.com> This patch started as a simple typo fix (pugre instead of purge in two places), as well as a fix of a test which was using PURGE_TARGETS instead of $PURGE_TARGETS. It evolved in a slight handling change of the OPTIONS which have a variable affecting their behavior (strip STRIP_DIRS, docs DOC_DIRS, zipman MAN_DIRS and purge PURGE_TARGETS), as well as a clarification in makepkg.conf. Now when a variable is undefined or empty, the corresponding option will have no effect. It looked weird to have a fallback when a option is defined but empty, it seems more natural to not have any fallbacks. Also re-enable docs by default. It seems arbitrary to delete files from packages by default, and it would be more vanilla and distro agnostic to keep them. docs was also the only negated option. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- doc/makepkg.conf.5.txt | 5 +++-- etc/makepkg.conf.in | 20 ++++++++++---------- scripts/makepkg.sh.in | 20 +++++--------------- 3 files changed, 18 insertions(+), 27 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 044c69e..f699f50 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -128,10 +128,11 @@ Options Leave empty directories in packages. *zipman*;; - Compress manual (man and info) pages with gzip. + Compress manual (man and info) pages with gzip. The directories + affected are specified by the `MAN_DIRS` variable. *purge*;; - Remove files specified by the `PUGRE_TARGETS` variable from the + Remove files specified by the `PURGE_TARGETS` variable from the package. **INTEGRITY_CHECK=(**check1 ...**)**:: diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 675e5f9..d811867 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -59,27 +59,27 @@ BUILDENV=(fakeroot !distcc color !ccache !xdelta) # These are default values for the options=() settings ######################################################################### # -# Default: OPTIONS=(strip !docs libtool emptydirs zipman purge) +# Default: OPTIONS=(strip docs libtool emptydirs zipman purge) # A negated option will do the opposite of the comments below. # -#-- strip: Strip symbols from binaries/libraries -#-- docs: Save doc and info directories +#-- strip: Strip symbols from binaries/libraries in STRIP_DIRS +#-- docs: Save doc directories specified by DOC_DIRS #-- libtool: Leave libtool (.la) files in packages #-- emptydirs: Leave empty directories in packages -#-- zipman: Compress manual (man and info) pages with gzip -#-- purge: Remove files sepecified below from package +#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip +#-- purge: Remove files specified by PURGE_TARGETS # -OPTIONS=(strip !docs libtool emptydirs zipman purge) +OPTIONS=(strip docs libtool emptydirs zipman purge) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) -#-- Manual (man and info) directories to compress (if option set correctly above) +#-- Manual (man and info) directories to compress (if zipman is specified) MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) -#-- Doc directories to remove (if option set correctly above) +#-- Doc directories to remove (if !docs is specified) DOC_DIRS=(usr/{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) -#-- Directories to be searched for the strip option (if option set correctly above) +#-- Directories to be searched for the strip option (if strip is specified) STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin}) -#-- Files to be removed from all packages +#-- Files to be removed from all packages (if purge is specified) PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) ######################################################################### diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 3e0781f..cb52b80 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -712,14 +712,13 @@ tidy_install() { cd "$pkgdir" msg "$(gettext "Tidying install...")" - if [ "$(check_option docs)" = "n" ]; then + if [ "$(check_option docs)" = "n" -a -n "${DOC_DIRS[*]}" ]; then msg2 "$(gettext "Removing doc files...")" - #fix flyspray bug #5021 rm -rf ${DOC_DIRS[@]} fi - if [ "$(check_option purge)" = "y" -a -n "PURGE_TARGETS" ]; then - msg2 "$(gettext "Removing pugre targets...")" + if [ "$(check_option purge)" = "y" -a -n "${PURGE_TARGETS[*]}" ]; then + msg2 "$(gettext "Removing files in %s...")" "PURGE_TARGETS" local pt for pt in "${PURGE_TARGETS[@]}"; do if [ "${pt}" == "${pt//\/}" ]; then @@ -730,13 +729,9 @@ tidy_install() { done fi - if [ "$(check_option zipman)" = "y" ]; then + if [ "$(check_option zipman)" = "y" -a -n "${MAN_DIRS[*]}" ]; then msg2 "$(gettext "Compressing man and info pages...")" local manpage ext file link hardlinks hl - if [ -z "${MAN_DIRS[*]}" ]; then - # fall back to default value - MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) - fi find ${MAN_DIRS[@]} -type f 2>/dev/null | while read manpage ; do # check file still exists (potentially compressed with hard link) @@ -769,14 +764,9 @@ tidy_install() { done fi - if [ "$(check_option strip)" = "y" ]; then + if [ "$(check_option strip)" = "y" -a -n "${STRIP_DIRS[*]}" ]; then msg2 "$(gettext "Stripping debugging symbols from binaries and libraries...")" local binary - if [ -z "${STRIP_DIRS[*]}" ]; then - # fall back to default value - STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} - opt/*/{bin,lib,sbin}) - fi find ${STRIP_DIRS[@]} -type f 2>/dev/null | while read binary ; do case "$(file -biz "$binary")" in *application/x-sharedlib*) # Libraries (.so) -- 1.6.1

4 5

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.2-46-g0501d34
by dan＠archlinux.org 07 Jan '09

07 Jan '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 0501d340cd57b3b1f31d9b7c273e882e21d0e621 (commit) via c6bcdf4dc7148e372607026be7b3ee869caf81b2 (commit) via 9f5e1dc8cd70d4e01d87e24e2ff7fdcb5aae204e (commit) via cebe36c42cd7ac74c2ff4ee5f8b1ac35c234f534 (commit) via 301fe17f5756cbbbf8265a1f1ddd3af069239734 (commit) from 6f9539aefb13e640f97a72121de13b749846f648 (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 0501d340cd57b3b1f31d9b7c273e882e21d0e621 Merge: 6f9539aefb13e640f97a72121de13b749846f648 c6bcdf4dc7148e372607026be7b3ee869caf81b2 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 6 20:22:15 2009 -0600 Merge branch 'maint' ----------------------------------------------------------------------- Summary of changes: NEWS | 16 ++ configure.ac | 4 +- lib/libalpm/po/cs.po | 74 +++++----- po/cs.po | 440 ++++++++++++++++++++++++-------------------------- po/pt_BR.po | 44 +++--- 5 files changed, 287 insertions(+), 291 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository annotated tag, v3.2.2, created. v3.2.2
by dan＠archlinux.org 07 Jan '09

07 Jan '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 annotated tag, v3.2.2 has been created at f3c5ed929e31c810d5201b6e30af223b13e81ec3 (tag) tagging c6bcdf4dc7148e372607026be7b3ee869caf81b2 (commit) replaces v3.2.1 tagged by Dan McGee on Mon Jan 5 22:45:19 2009 -0600 - Log ----------------------------------------------------------------- Happy New Year! -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEABECAAYFAkli4eYACgkQXC5GoPU6du0ovwCfYeE13jAgyH3KG/37cRM5tD57 zn8An1VxrQZzF88I/+zI8Xws4hpG+AdK =yqeV -----END PGP SIGNATURE----- Allan McRae (8): makepkg: fix updating PKGBUILD when building SCM packages Add optdepends to PKGBUILD.proto contrib/pactree: fix option parsing makepkg: Replace getopt with internal function makepkg: quote all uses of BUILDSCRIPT makepkg: tidy version package tests makepkg: detect incorrect usage of provides array Separate local db directory creation and db write Dan McGee (22): Ensure we don't have double slashes when creating frontend paths libalpm: handle syscall interruption correctly Reduce number of calls to getcols() Rework fakechroot checking Attempt to idiot-proof making and refreshing docs Remove unnecessary unistd.h header inclusion Make interrupt handler async-safe Correctly close the pipe used for scriptlet execution repo-add: Use openssl instead of md5sum Give pacman-optimize a refresher makepkg: fix bash substitution to work under older versions Minor code cleanups Simplify mercurial revision command Add regex to delta code so we don't segfault when reading line makepkg: save and restore shell options before and after build() Small documentation updates for clarity Remove mention of -b from makepkg manpage Print proxy information when downloading Small makefile update Add new po files in prep for 3.2.2 release Update NEWS for 3.2.2 Update configure.ac for 3.2.2 release Giovanni Scafora (1): Update Italian translation Hugo Doria (1): Update Portuguese (Brazil) translation Juan Pablo González Tognarelli (1): Update Spanish translation Lyman Li (1): Update Chinese translation Mateusz Herych (1): Update Polish translation Matthias Gorissen (1): Update German translation Nagy Gabor (2): Give an error message on alpm_db_register_sync() error Update Hungarian translation Roman Kyrylych (1): Update Unkranian translation Samed Beyribey (1): Update Turkish translation Sergey Tereschenko (3): Minor updates to Russian translation Update Russian translation Update Russian translation Simo Leone (1): Add flush after downloading message Sterling Winter (1): Log pacsave warnings to pacman.log Vojtěch Gondžala (1): Update Czech translation Xavier Chantry (4): Separate targets on -Qi/-Si with a newline. Another attempt at fixing totaldownload. Fix asciidoc manpage creation. Update French translation 甘露(Gan Lu) (1): Update Chinese translation ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [announce] Pacman 3.2.2 released
by Dan McGee 07 Jan '09

07 Jan '09

I've released pacman 3.2.2 tonight. Thanks for everyone that contributed to this release, and thanks to the translators for having quick turnaround time. The NEWS file should cover most of what is new and/or fixed: http://projects.archlinux.org/?p=pacman.git;a=blob;f=NEWS;h=f0a88fd88189fb2… -Dan

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.1-51-gc6bcdf4
by dan＠archlinux.org 07 Jan '09

07 Jan '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, maint has been updated via c6bcdf4dc7148e372607026be7b3ee869caf81b2 (commit) via 9f5e1dc8cd70d4e01d87e24e2ff7fdcb5aae204e (commit) via cebe36c42cd7ac74c2ff4ee5f8b1ac35c234f534 (commit) via 301fe17f5756cbbbf8265a1f1ddd3af069239734 (commit) from 997a611fa442c5b8f096746fd21b954864b0af44 (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 c6bcdf4dc7148e372607026be7b3ee869caf81b2 Author: Vojtěch Gondžala <vojtech.gondzala(a)gmail.com> Date: Mon Jan 5 19:06:39 2009 -0600 Update Czech translation Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9f5e1dc8cd70d4e01d87e24e2ff7fdcb5aae204e Author: Hugo Doria <hugo(a)archlinux.org> Date: Mon Jan 5 07:05:40 2009 -0600 Update Portuguese (Brazil) translation Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cebe36c42cd7ac74c2ff4ee5f8b1ac35c234f534 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jan 4 11:34:47 2009 -0600 Update configure.ac for 3.2.2 release Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 301fe17f5756cbbbf8265a1f1ddd3af069239734 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jan 4 11:27:03 2009 -0600 Update NEWS for 3.2.2 Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 16 ++ configure.ac | 4 +- lib/libalpm/po/cs.po | 74 +++++----- po/cs.po | 440 ++++++++++++++++++++++++-------------------------- po/pt_BR.po | 44 +++--- 5 files changed, 287 insertions(+), 291 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [translation] Czech translation
by Vojtěch Gondžala 05 Jan '09

05 Jan '09

Hi, updated and corrected translations. -- Vojtěch „vogo“ Gondžala

1 0

[pacman-dev] No remove progress during -S with conflict
by Scott Horowitz 05 Jan '09

05 Jan '09

There seems to be a change in behavior dealing with removing packages on an -S operation due to package conflicts. In the past, it was clear when pacman was removing a package because you got the progress line. Now, it appears to silently remove. For example, if I have python-mpd-git installed and do a pacman -S python-mpd, which of course conflicts with the former, I get the following: $ pacman -S python-mpd resolving dependencies... looking for inter-conflicts... :: python-mpd conflicts with python-mpd-git. Remove python-mpd-git? [Y/n] Remove (1): python-mpd-git-20090101-1 Total Removed Size: 0.05 MB Targets (1): python-mpd-0.2.1-2 Total Download Size: 0.00 MB Total Installed Size: 0.05 MB Proceed with installation? [Y/n] I chose yes to the first question but I'm not sure if it has yet been removed by the time I get to the second question. (Testing this, I see that it hasn't.) If I then click yes to proceed with the installation, I get: :: Retrieving packages from extra... python-mpd-0.2.1-2-i686 7.7K 49.4K/s 00:00:00 [#############################] 100% checking package integrity... (1/1) checking for file conflicts [#############################]100% (1/1) installing python-mpd [#############################]100% So it never shows that the package was removed. I think it would be better if it did, like when I do a pacman -R operation. I believe it worked this way in the past and it seems more obvious to the user what's happening. Scott

2 1

[pacman-dev] [translation] Portuguese (Brazil) translation updated
by Hugo Doria 05 Jan '09

05 Jan '09

And here it goes ... -- Hugo

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.1-92-g6f9539a
by dan＠archlinux.org 04 Jan '09

04 Jan '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 6f9539aefb13e640f97a72121de13b749846f648 (commit) via 997a611fa442c5b8f096746fd21b954864b0af44 (commit) via 162e77ffdc9565c7392092f695151fed7774ab42 (commit) via a2cbccb8c73acbb1062f76c5830857bb2facb532 (commit) via c850786e43d6682953ece1e0fbf356d8b9c4664f (commit) via 3acc265f9d89ea5596306b8af3cf54d4d66a7b07 (commit) via 03a63e01a555dfcf60f0f9f040f03bc581a294fe (commit) via 024012649fe014999ac9b494366f187ca3c59640 (commit) via 93d47ebbc0e9168cc65e8c377791c78399332ade (commit) via c2dc05c065b3ba54dd5ee728b4910830e6d872fb (commit) via fb18679a0001c45fb478eaec882c37bd669ff6bd (commit) via 792ee976455d4c33c802f58d28d56550a61c3c65 (commit) from a30bf868ca4cce5464f7e4aa55cd7e7d4eade9a2 (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 6f9539aefb13e640f97a72121de13b749846f648 Merge: a30bf868ca4cce5464f7e4aa55cd7e7d4eade9a2 997a611fa442c5b8f096746fd21b954864b0af44 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jan 4 11:12:28 2009 -0600 Merge branch 'maint' Conflicts: po/it.po ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/de.po | 3 +- lib/libalpm/po/es.po | 16 ++-- lib/libalpm/po/it.po | 78 +++++++++--------- lib/libalpm/po/pl.po | 3 +- lib/libalpm/po/ru.po | 6 +- lib/libalpm/po/tr.po | 13 ++-- lib/libalpm/po/uk.po | 18 +++-- po/de.po | 50 ++++-------- po/es.po | 147 +++++++++++++++++---------------- po/fr.po | 41 +++------- po/hu.po | 25 ++---- po/it.po | 145 ++++++++++++++++++---------------- po/pl.po | 26 +++--- po/ru.po | 66 +++++++++------ po/tr.po | 49 +++++------ po/uk.po | 43 +++++----- po/zh_CN.po | 219 +++++++++++++++++++++++--------------------------- 17 files changed, 458 insertions(+), 490 deletions(-) hooks/post-receive -- The official pacman repository

1 0