- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] New sync1007.py pactest
by Nagy Gabor 14 Jan '08

14 Jan '08

From 49a346d598433b46e19f841432938f84df480c28 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri, 11 Jan 2008 21:02:50 +0100 Subject: [PATCH] New sync1007.py pactest This pactest checks what happens when more than one package can replace the same package. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- pactest/tests/sync1007.py | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) create mode 100644 pactest/tests/sync1007.py diff --git a/pactest/tests/sync1007.py b/pactest/tests/sync1007.py new file mode 100644 index 0000000..6f5d9f6 --- /dev/null +++ b/pactest/tests/sync1007.py @@ -0,0 +1,19 @@ +self.description = "Multiple packages replace the same package" + +sp1 = pmpkg("alternative1") +sp1.replaces = [ "pkg" ] +self.addpkg2db("sync", sp1) + +sp2 = pmpkg("alternative2") +sp2.replaces = [ "pkg" ] +self.addpkg2db("sync", sp2) + +lp = pmpkg("pkg", "1.0-1") +self.addpkg2db("local", lp) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("PKG_EXIST=alternative1") +self.addrule("!PKG_EXIST=alternative2") -- 1.5.3.7

2 4

[pacman-dev] [PATCH] small sync.c code clean-up
by Nagy Gabor 14 Jan '08

14 Jan '08

From e7c8c05f91737d5e96cd2e6ec80958580619d1b1 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Mon, 14 Jan 2008 14:29:41 +0100 Subject: [PATCH] small sync.c code clean-up Remove unnecessary synclist_free function, and use our standard way (alpm_list_free_inner + alpm_list_free) instead. This slightly reduces code duplication. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/sync.c | 22 ++++++---------------- 1 files changed, 6 insertions(+), 16 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index fbe5780..ca50efe 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -78,20 +78,6 @@ void _alpm_sync_free(pmsyncpkg_t *sync) FREE(sync); } -static void synclist_free(alpm_list_t *syncpkgs) -{ - if(syncpkgs) { - alpm_list_t *tmp; - for(tmp = syncpkgs; tmp; tmp = alpm_list_next(tmp)) { - if(tmp->data) { - _alpm_sync_free(tmp->data); - } - } - alpm_list_free(syncpkgs); - } - -} - /* Find recommended replacements for packages during a sync. */ static int find_replacements(pmtrans_t *trans, pmdb_t *db_local, @@ -154,7 +140,9 @@ static int find_replacements(pmtrans_t *trans, pmdb_t *db_local, sync = _alpm_sync_new(PM_SYNC_TYPE_REPLACE, spkg, NULL); if(sync == NULL) { pm_errno = PM_ERR_MEMORY; - synclist_free(*syncpkgs); + alpm_list_free_inner(*syncpkgs, (alpm_list_fn_free)_alpm_sync_free); + alpm_list_free(*syncpkgs); + *syncpkgs = NULL; return(-1); } sync->data = alpm_list_add(NULL, lpkg); @@ -244,7 +232,9 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, sync = _alpm_sync_new(PM_SYNC_TYPE_UPGRADE, spkg, local); if(sync == NULL) { pm_errno = PM_ERR_MEMORY; - synclist_free(*syncpkgs); + alpm_list_free_inner(*syncpkgs, (alpm_list_fn_free)_alpm_sync_free); + alpm_list_free(*syncpkgs); + *syncpkgs = NULL; return(-1); } *syncpkgs = alpm_list_add(*syncpkgs, sync); -- 1.5.3.7

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.1.0-27-gfd86c62
by Dan McGee 14 Jan '08

14 Jan '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 fd86c62db856cea7cdd8edac2e721543dd1ebf04 (commit) from ffff09412627f991e2d1f0bdfdf7ca13f3d589c0 (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 fd86c62db856cea7cdd8edac2e721543dd1ebf04 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jan 13 23:26:31 2008 -0600 Fix typos in code comments Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/repo-add.sh.in | 8 ++++---- scripts/repo-remove.sh.in | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.1.0-26-gffff094
by Dan McGee 14 Jan '08

14 Jan '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 ffff09412627f991e2d1f0bdfdf7ca13f3d589c0 (commit) from 6ee95afe7e9ac1b0ecdc517948ecdcc3b69ccf68 (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 ffff09412627f991e2d1f0bdfdf7ca13f3d589c0 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jan 13 19:15:59 2008 -0600 makepkg: Oops! Lost the colon after forcever in opts parsing I screwed this up here: 916e226b7839e38d9245ecbef396eb5ba5b6a224 Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.1.0-25-g6ee95af
by Dan McGee 14 Jan '08

14 Jan '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 6ee95afe7e9ac1b0ecdc517948ecdcc3b69ccf68 (commit) via e93b0a2f37a41e8ba38f7ae7aa6f4ec7c5b8664d (commit) via 916e226b7839e38d9245ecbef396eb5ba5b6a224 (commit) via 801a26805663b0a79bf619a0fec853293806969b (commit) via 549c2878f965e5b6cb001ff3c8c5e3122becf8e1 (commit) via 8186dc11a90dbc310acaad7ee867ee995adbd6ed (commit) from bbe02ec57fd56670dfe0bc08d981ce8a1aa31370 (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 6ee95afe7e9ac1b0ecdc517948ecdcc3b69ccf68 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sun Jan 13 22:43:53 2008 +0100 doc: update documentation for --recursive and --cascade This addresses some of the issues in FS#9192. Attempt to clarify the -Rc and -Rs options in the man page. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e93b0a2f37a41e8ba38f7ae7aa6f4ec7c5b8664d Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jan 13 17:41:35 2008 -0600 doc: update makepkg options Add documentation for --holdver (from Scott) and --forcever (saying this is an internal option that should not be used by most end users), and re-alphabetize the --asroot option. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 916e226b7839e38d9245ecbef396eb5ba5b6a224 Author: Scott Horowitz <stonecrest(a)gmail.com> Date: Sun Jan 13 17:39:06 2008 -0600 makepkg: Introduce --holdver option to prevent bumped pkgrel This allows us to keep the --forcever option internal to makepkg. Fixes FS#9194. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 801a26805663b0a79bf619a0fec853293806969b Author: Jaroslaw Swierczynski <swiergot(a)juvepoland.com> Date: Sun Jan 13 15:06:25 2008 +0100 FS#9183 : force correct permissions on tmp/. [Xav: removed unneeded makepath_internal function, and fixed the permission value : 1777 -> 01777] Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 549c2878f965e5b6cb001ff3c8c5e3122becf8e1 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jan 13 14:14:34 2008 -0600 Disallow a NULL section in _parseconfig If we allow _parseconfig to continue processing when section is not defined, then we have the potential to segfault during strcmp calls. This is no good. For some reason, we had existing logic that tested this case but only if it was processing and 'Include' directive. Expand the check to check for a NULL section in all cases, and print an error message if this is the case. Reported here: http://bbs.archlinux.org/viewtopic.php?id=42235 Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8186dc11a90dbc310acaad7ee867ee995adbd6ed Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sun Jan 13 11:08:59 2008 +0100 Ensure correct dir permissions in the database. Fix for FS#9176. A previous commit (6e8daa553bbd5) already forced all database files to 644. Now the directories are also forced to 755. Additionally, repo-add now sets the umask to 022, just like makepkg does, to fix the problem at its root. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.8.txt | 20 +++++++++++++++----- doc/pacman.8.txt | 12 +++++++----- lib/libalpm/trans.c | 2 +- lib/libalpm/util.c | 11 +++++++++-- lib/libalpm/util.h | 1 + scripts/makepkg.sh.in | 32 ++++++++++++++++++++++++-------- scripts/repo-add.sh.in | 3 +++ src/pacman/pacman.c | 4 ++-- 8 files changed, 62 insertions(+), 23 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Cleanup to Arch-specific pacman.conf
by Travis Willard 13 Jan '08

13 Jan '08

This patch cleans up the Arch-specific pacman.conf (to be provided in the pacman Archlinux package) in an attempt to reduce the number of PEBKAC errors seen enabling default-disabled repos. Not a git patch, but a straight diff -u, since the Arch-specific file won't anymore be in the git repo, and I figured a patch against the generated pacman.conf'd be better than a patch against pacman.conf.in. If I'm mistaken, I'll patch the version in the projects.archlinux.org git repo (master branch) and submit that patch instead. Let me know. Signed-off-by: Travis Willard <travis(a)archlinux.org>

3 2

[pacman-dev] Czech translation update
by Vojtěch Gondžala 13 Jan '08

13 Jan '08

Hi all, this is the last update for this moment, I hope :) vogo

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.1.0-27-g521de7c
by Dan McGee 13 Jan '08

13 Jan '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 521de7ceedc6e4f5df52c0380f536a6f13a7f578 (commit) via bbe02ec57fd56670dfe0bc08d981ce8a1aa31370 (commit) via 47e8dd0670f14ae2a1efe25fc920d1d46cdec586 (commit) via 78e7342c1625f9cba399b89ab58a20599ae12c5a (commit) via ab506f77c04a481782d9e53c6a285227f58f5cf7 (commit) via 3de21473768c1801833a10a1872ce7612e8edb59 (commit) via 4f267017936471c8248a85f8d86aabb96e66c7e8 (commit) via 435ec29bc75fc9efd81472ce2f53d081f8be14b8 (commit) via 633dbeac88316f71f0f5642b4b8b00cc6d262919 (commit) via e654236db6b01d21cff7c850efedff183dd86b61 (commit) via 26f4993e1d67a7daae1dcac47e112f9b15a6bf97 (commit) from 2630556bdef7a07fda056fdcd0a2fa00c3625d3c (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 521de7ceedc6e4f5df52c0380f536a6f13a7f578 Merge: 4f267017936471c8248a85f8d86aabb96e66c7e8 bbe02ec57fd56670dfe0bc08d981ce8a1aa31370 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jan 13 12:27:17 2008 -0600 Merge branch 'maint' commit 4f267017936471c8248a85f8d86aabb96e66c7e8 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 12 20:18:20 2008 -0600 memleak fix with new dynamic depend structure Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 435ec29bc75fc9efd81472ce2f53d081f8be14b8 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Jan 12 21:27:13 2008 +0100 libalpm/sync.c: don't duplicate packages for the sync->data field. Packages put in the sync->data field were always duplicated with pkg_dup, and then freed, This is not needed. Killing this duplication of packages made the memory usage during base reinstall go from 10.4 MB to 8.1 MB. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 26f4993e1d67a7daae1dcac47e112f9b15a6bf97 Author: Aaron Griffin <aaronmgriffin(a)gmail.com> Date: Wed Jan 9 18:24:11 2008 -0600 Store replaces in the local DB too Signed-off-by: Aaron Griffin <aaronmgriffin(a)gmail.com> [Dan: might as well store 'force' too] Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/zsh_completion | 20 +++++--------------- doc/PKGBUILD.5.txt | 2 +- lib/libalpm/be_files.c | 37 +++++++++---------------------------- lib/libalpm/conflict.c | 2 +- lib/libalpm/deps.c | 20 ++++++++++++-------- lib/libalpm/remove.c | 4 +++- lib/libalpm/sync.c | 42 +++++++----------------------------------- lib/libalpm/util.c | 2 -- scripts/gensync.sh.in | 6 +++--- scripts/updatesync.sh.in | 4 ++-- src/pacman/callback.c | 18 +++++++++++++----- 11 files changed, 56 insertions(+), 101 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.1.0-19-gbbe02ec
by Dan McGee 13 Jan '08

13 Jan '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 bbe02ec57fd56670dfe0bc08d981ce8a1aa31370 (commit) via 47e8dd0670f14ae2a1efe25fc920d1d46cdec586 (commit) via 78e7342c1625f9cba399b89ab58a20599ae12c5a (commit) via ab506f77c04a481782d9e53c6a285227f58f5cf7 (commit) via 3de21473768c1801833a10a1872ce7612e8edb59 (commit) via 633dbeac88316f71f0f5642b4b8b00cc6d262919 (commit) via e654236db6b01d21cff7c850efedff183dd86b61 (commit) from 8ffa6fa7adf291b3dad822c459e1372a31af09f1 (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: contrib/zsh_completion | 20 +++++--------------- doc/PKGBUILD.5.txt | 2 +- lib/libalpm/deps.c | 20 ++++++++++++-------- lib/libalpm/remove.c | 4 +++- lib/libalpm/util.c | 2 -- scripts/gensync.sh.in | 6 +++--- scripts/updatesync.sh.in | 4 ++-- src/pacman/callback.c | 18 +++++++++++++----- 8 files changed, 39 insertions(+), 37 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Update Gensync and Updatesync to use new PKGEXT variable, which includes leading period.
by Travis Willard 13 Jan '08

13 Jan '08

Previously, this caused both scripts to look for pkgname-pkgver-pkgrel-arch..pkg.tar.gz - extra period has been removed Fixes FS9190 Signed-off-by: Travis Willard <travis(a)archlinux.org> --- scripts/gensync.sh.in | 6 +++--- scripts/updatesync.sh.in | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/gensync.sh.in b/scripts/gensync.sh.in index b49c26e..04f8002 100644 --- a/scripts/gensync.sh.in +++ b/scripts/gensync.sh.in @@ -130,13 +130,13 @@ for file in $(find "$rootdir"/* -name "$BUILDSCRIPT"); do CARCH='any' fi if [ "$pkgdir" != "" ]; then - pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT" + pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-${CARCH}${PKGEXT}" else - pkgfile="$destdir/$pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT" + pkgfile="$destdir/$pkgname-$pkgver-$pkgrel-${CARCH}${PKGEXT}" fi if [ ! -f "$pkgfile" ]; then - error "$(gettext "could not find %s-%s-%s-%s.%s - skipping")" $pkgname $pkgver $pkgrel $CARCH $PKGEXT + error "$(gettext "could not find %s-%s-%s-%s%s - skipping")" $pkgname $pkgver $pkgrel $CARCH $PKGEXT else if check_force; then forcepkgs="$forcepkgs $pkgfile" diff --git a/scripts/updatesync.sh.in b/scripts/updatesync.sh.in index 2e47ac9..900f11f 100644 --- a/scripts/updatesync.sh.in +++ b/scripts/updatesync.sh.in @@ -127,10 +127,10 @@ if [ "$action" = "upd" ]; then # INSERT / UPDATE if [ "$arch" = 'any' ]; then CARCH='any' fi - pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT" + pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-${CARCH}${PKGEXT}" if [ ! -f "$pkgfile" ]; then - die "$(gettext "could not find %s-%s-%s-%s.%s - aborting")" $pkgname $pkgver $pkgrel $CARCH $PKGEXT + die "$(gettext "could not find %s-%s-%s-%s%s - aborting")" $pkgname $pkgver $pkgrel $CARCH $PKGEXT fi if check_force; then -- 1.5.3.7

2 1