- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] libalpm/remove.c : switch back to lstat usage.
by Chantry Xavier 22 Dec '07

22 Dec '07

commit b55abdce7a changed every instance of lstat to alpm_stat to remove an eventual trailing /, but in remove.c, this is not wanted. Ref: http://www.archlinux.org/pipermail/pacman-dev/2007-December/010451.html Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- lib/libalpm/remove.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 0e8b57a..125719a 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -203,7 +203,7 @@ static void unlink_file(pmpkg_t *info, alpm_list_t *lp, pmtrans_t *trans) } } - if(_alpm_lstat(file, &buf)) { + if(lstat(file, &buf)) { _alpm_log(PM_LOG_DEBUG, "file %s does not exist\n", file); return; } -- 1.5.3.7

2 2

[pacman-dev] [PATCH] french translation : one broken message caused a segfault.
by Chantry Xavier 22 Dec '07

22 Dec '07

pacman segfaulted on sync012 pactest because of one broken translation. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- lib/libalpm/po/fr.po | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/po/fr.po b/lib/libalpm/po/fr.po index f9e1093..836ff82 100644 --- a/lib/libalpm/po/fr.po +++ b/lib/libalpm/po/fr.po @@ -6,14 +6,12 @@ msgstr "" "Project-Id-Version: Pacman package manager 3.0.1\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" "POT-Creation-Date: 2007-12-21 11:06+0100\n" -"PO-Revision-Date: 2007-12-21 11:07+0100\n" +"PO-Revision-Date: 2007-12-22 18:43+0100\n" "Last-Translator: Xavier <shiningxc(a)gmail.com>\n" "Language-Team: solsTiCe d'Hiver <solstice.dhiver(a)laposte.net>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: French\n" -"X-Poedit-Country: FRANCE\n" #: lib/libalpm/add.c:86 #, c-format @@ -168,7 +166,7 @@ msgstr "base de données non initialisée\n" #: lib/libalpm/deps.c:171 msgid "dependency cycle detected:\n" -msgstr "cycle de dépendances détecté: %s\n" +msgstr "cycle de dépendances détecté:\n" #: lib/libalpm/deps.c:173 #, c-format -- 1.5.3.7

3 3

[pacman-dev] [PATCH] New fileconflict003.py and fileconflict004.py pactests
by Nagy Gabor 22 Dec '07

22 Dec '07

From e22982584b226b541779fbe63aee18d9eea6b781 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat, 22 Dec 2007 22:33:43 +0100 Subject: [PATCH] New fileconflict003.py and fileconflict004.py pactests These pactests check whether pacman detects filesystem vs package directory-symlink (file)conflicts. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- pactest/tests/fileconflict003.py | 16 ++++++++++++++++ pactest/tests/fileconflict004.py | 16 ++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) create mode 100644 pactest/tests/fileconflict003.py create mode 100644 pactest/tests/fileconflict004.py diff --git a/pactest/tests/fileconflict003.py b/pactest/tests/fileconflict003.py new file mode 100644 index 0000000..1a6b354 --- /dev/null +++ b/pactest/tests/fileconflict003.py @@ -0,0 +1,16 @@ +self.description = "Fileconflict with symlinks (3)" + +lp = pmpkg("dummy") +lp.files = ["dir/realdir/", + "dir/symdir -> realdir"] +self.addpkg2db("local", lp) + +p1 = pmpkg("pkg1") +p1.files = ["dir/realdir/", + "dir/symdir -> realdir"] +self.addpkg(p1) + +self.args = "-A %s" % p1.filename() + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=pkg1") diff --git a/pactest/tests/fileconflict004.py b/pactest/tests/fileconflict004.py new file mode 100644 index 0000000..5078f29 --- /dev/null +++ b/pactest/tests/fileconflict004.py @@ -0,0 +1,16 @@ +self.description = "Fileconflict with symlinks (4)" + +lp = pmpkg("dummy") +lp.files = ["dir/localdir/", + "dir/symdir -> localdir"] +self.addpkg2db("local", lp) + +p1 = pmpkg("pkg1") +p1.files = ["dir/realdir/", + "dir/symdir -> realdir"] +self.addpkg(p1) + +self.args = "-A %s" % p1.filename() + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=pkg1") -- 1.5.3.7

1 0

Re: [pacman-dev] [arch-dev-public] Fwd: [signoff] bash 3.2.0330-1 and filesystem 2007.11-4
by Xavier 22 Dec '07

22 Dec '07

Aaron Griffin wrote: > Please retest. This bash package overrides the previous one. Patch > level updated, profile.bash added to backup=() array. > > Potential issue: Apparently /etc/profile is not replaced if modified. > Can someone verify if this is fixed or not? I will investigate further > as I fear it may be a pacman bug - if so, I'm guessing keeping > etc/profile in BOTH backup arrays for the time being may fix this. > Just to sum up : old bash has /etc/profile, in its backup array old filesystem doesn't have that file new bash doesn't have that file new filesystem has /etc/profile, in its backup array When doing the upgrade, the following debug logs appear : [22:08:55] debug: file in backup array, adding to add and remove skiplist: etc/profile That's line 443 of libalpm/conflict.c.There is a whole part in the file conflict checking to see if a file has changed hands. Since the file was added to add skiplist, here is what happens when filesystem is extracted in libalpm/add.c : [22:08:55] debug: etc/profile is in trans->skip_add, skipping extraction So there is no profile.pacnew extracted at this point. However, if you reinstall filesystem after that, the .pacnew will now show up, as usual. I know, that was the easy part of just saying what is going on. And no progress on the hard part to think about a fix.

1 0

[pacman-dev] [PATCH] libalpm/add.c: disable buggy backup handling code that didn't do anything.
by Chantry Xavier 22 Dec '07

22 Dec '07

As I mentioned earlier on the ML : http://www.archlinux.org/pipermail/pacman-dev/2007-December/010416.html the first part of commit 843d368ef6 had no effect because of a bug. So I fixed the bug, but since this would change backup handling behavior, and possibly require other bigger changes to work right, I decided to just disable that part temporarily, and left a TODO in the code. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- lib/libalpm/add.c | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 11c5eb8..292a011 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -234,26 +234,37 @@ static int upgrade_remove(pmpkg_t *oldpkg, pmpkg_t *newpkg, pmtrans_t *trans, pm tr->skip_remove = alpm_list_strdup(trans->skip_remove); const alpm_list_t *b; - /* Add files in the OLD and NEW backup array to the NoUpgrade array + /* Add files in the NEW backup array to the NoUpgrade array * so this removal operation doesn't kill them */ alpm_list_t *old_noupgrade = alpm_list_strdup(handle->noupgrade); /* old package backup list */ - for(b = alpm_pkg_get_backup(oldpkg); b; b = b->next) { - const char *backup = b->data; + for(b = alpm_pkg_get_backup(newpkg); b; b = b->next) { + char *backup = _alpm_backup_file(b->data); _alpm_log(PM_LOG_DEBUG, "adding %s to the NoUpgrade array temporarily\n", backup); - handle->noupgrade = alpm_list_add(handle->noupgrade, strdup(backup)); + handle->noupgrade = alpm_list_add(handle->noupgrade, + backup); } + + /* TODO: we could also add files in the OLD backup array, but this would + * change the backup handling behavior, and break several pactests, and we + * can't do this just before 3.1 release. + * The unlink_file function in remove.c would also need to be reviewed. */ +#if 0 /* new package backup list */ - for(b = alpm_pkg_get_backup(newpkg); b; b = b->next) { - const char *backup = b->data; + for(b = alpm_pkg_get_backup(oldpkg); b; b = b->next) { + char *backup = _alpm_backup_file(b->data); /* make sure we don't add duplicate entries */ if(!alpm_list_find_ptr(handle->noupgrade, backup)) { _alpm_log(PM_LOG_DEBUG, "adding %s to the NoUpgrade array temporarily\n", backup); - handle->noupgrade = alpm_list_add(handle->noupgrade, strdup(backup)); + handle->noupgrade = alpm_list_add(handle->noupgrade, + _alpm_backup_file(backup)); + handle->noupgrade = alpm_list_add(handle->noupgrade, + backup); } } +#endif int ret = _alpm_remove_commit(tr, db); -- 1.5.3.7

1 0

[pacman-dev] [PATCH] fix two broken pactests because of date localization.
by Chantry Xavier 22 Dec '07

22 Dec '07

query002 and sync1100 had PACMAN_OUTPUT rules that looked at the build/install date (localized). Instead of looking at the month name, it will now check the year, which should be safer. I also had to add another pactest (query005) for keeping the same coverage. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- pactest/tests/query002.py | 6 ++---- pactest/tests/query005.py | 21 +++++++++++++++++++++ pactest/tests/sync1100.py | 2 +- 3 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 pactest/tests/query005.py diff --git a/pactest/tests/query002.py b/pactest/tests/query002.py index c6a6c7d..7d94364 100644 --- a/pactest/tests/query002.py +++ b/pactest/tests/query002.py @@ -7,9 +7,8 @@ p.groups = ["foo"] p.url = "http://www.archlinux.org" p.license = "GPL2" p.arch = "i686" -# test both old style and new style dates +# test old style date p.builddate = "Mon Oct 1 01:40:21 2007 UTC" -p.installdate = "1196640127" p.packager = "Arch Linux" self.addpkg2db("local", p) @@ -19,5 +18,4 @@ self.args = "-Qi %s" % p.name self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_OUTPUT=%s" % p.name) self.addrule("PACMAN_OUTPUT=%s" % p.desc) -self.addrule("PACMAN_OUTPUT=Oct") -self.addrule("PACMAN_OUTPUT=Dec") +self.addrule("PACMAN_OUTPUT=2007") diff --git a/pactest/tests/query005.py b/pactest/tests/query005.py new file mode 100644 index 0000000..0c0bc51 --- /dev/null +++ b/pactest/tests/query005.py @@ -0,0 +1,21 @@ +self.description = "Query info on a package" + +p = pmpkg("foobar") +p.files = ["bin/foobar"] +p.desc = "test description" +p.groups = ["foo"] +p.url = "http://www.archlinux.org" +p.license = "GPL2" +p.arch = "i686" +# test new style date +p.builddate = "1196640127" +p.packager = "Arch Linux" + +self.addpkg2db("local", p) + +self.args = "-Qi %s" % p.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PACMAN_OUTPUT=%s" % p.name) +self.addrule("PACMAN_OUTPUT=%s" % p.desc) +self.addrule("PACMAN_OUTPUT=2007") diff --git a/pactest/tests/sync1100.py b/pactest/tests/sync1100.py index f0fb4f6..887b85e 100644 --- a/pactest/tests/sync1100.py +++ b/pactest/tests/sync1100.py @@ -20,4 +20,4 @@ self.args = "-Si %s" % sp.name self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_OUTPUT=%s" % sp.name) self.addrule("PACMAN_OUTPUT=%s" % sp.desc) -self.addrule("PACMAN_OUTPUT=Oct") +self.addrule("PACMAN_OUTPUT=2007") -- 1.5.3.7

1 0

[pacman-dev] [PATCH] Updated Italian translation
by Giovanni Scafora 22 Dec '07

22 Dec '07

Hi guys, here's updated italian translation with some improvements and adding 1 new translated message. Thanks. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

1 0

[pacman-dev] Some entries to NEWS
by Nagy Gabor 22 Dec '07

22 Dec '07

Hi! 1. We have implemented some new features after last NEWS update (for example: foo<1.0-1 dependency support), these commits should be reviewed. 2. I mention an undocumented (<- in NEWS) new feature, too: versioned conflicts (Xavier's conflict clean-up patch introduced this automagically, so this fact wasn't mentioned in commit message, only on ML) Bye

1 0

[pacman-dev] abs split from pacman before release
by Dan McGee 21 Dec '07

21 Dec '07

See here: <http://projects.archlinux.org/git/?p=abs.git;a=summary> If there are no objections, I'm going to push my remove abs patch to pacman, and throw this abs package up in my [pacman-git] repository for some quick testing. We are close to release, folks. Anything else outstanding that is critical? -Dan

4 9

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.6-700-g9addd88
by Dan McGee 21 Dec '07

21 Dec '07

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 9addd88a7d12c8c8445ec226e2837afe01e660b7 (commit) via 7fdb2ee48a3b252427405ee304af46b211fd2b84 (commit) via b43301428e50d006c9b94d1ced74f1f0775a04dc (commit) via 9a6582a8fd2195ad5294d07ced62df56961200e8 (commit) via 020629a371e6440f56e938a171d08fbec6b1971d (commit) via 3128535d1b8689578fe94ea3ef33f31eb7155ebe (commit) via b4a84e4f1d0dcb0e2292efece2e1c76b53c76a3b (commit) via 741fa316038eb0307e4aaffcac05eaa36303ead9 (commit) via c0845db8f7cc3f0fbf9bfadbdbb30b0acc96c242 (commit) via 8e53cea8f84332b394f503a8e6194c268e8283b1 (commit) via 25072219b5c3d3824325b2b4439424a7ca89ba16 (commit) from 6058a225b6753bd68d5d115ec444fc12effe4264 (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 9addd88a7d12c8c8445ec226e2837afe01e660b7 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Dec 21 15:47:30 2007 -0600 Do not move man pages to a non-FHS location Fixes Arch Linux bug FS#8839. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7fdb2ee48a3b252427405ee304af46b211fd2b84 Author: Nathan Jones <nathanj(a)insightbb.com> Date: Sat Dec 15 11:01:52 2007 -0500 Check ignored packages in _alpm_sync_addtarget(). This will allow someone to install a group but ignore individual packages inside the group. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b43301428e50d006c9b94d1ced74f1f0775a04dc Author: Nathan Jones <nathanj(a)insightbb.com> Date: Fri Dec 7 16:56:16 2007 -0500 Fix memory leak in shortest_delta_path. It is possible for the if statement to never succeed, causing path to never be freed. It is also possible for the if statement to succeed more than once per loop, which could have caused a segfault. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9a6582a8fd2195ad5294d07ced62df56961200e8 Author: Vojtěch Gondžala <vogo(a)seznam.cz> Date: Fri Dec 21 11:01:29 2007 -0600 Add new Czech translation Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 020629a371e6440f56e938a171d08fbec6b1971d Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Thu Dec 20 23:35:48 2007 +0100 Finish french translation. It's probably far from perfect, but at least I tried to translate everything. I noticed a missing newline at libalpm/trans.c , line 573 : _alpm_log(PM_LOG_ERROR, _("call to popen failed (%s)"), I don't think it's possible to fix it now (string freeze?), so I didn't. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 3128535d1b8689578fe94ea3ef33f31eb7155ebe Author: Giovanni Scafora <linuxmania(a)gmail.com> Date: Thu Dec 20 22:29:19 2007 +0100 Italian translation fixes Signed-off-by: Giovanni Scafora <linuxmania(a)gmail.com> modified: po/it.po Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b4a84e4f1d0dcb0e2292efece2e1c76b53c76a3b Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Fri Dec 14 08:55:14 2007 +0100 testdb : fix wrong usage of checkdeps. During last rebase where the checkdeps prototype changed, I messed up the arguments order (remove list, then upgrade list). That made testdb totally useless. Also remove the newline that was manually added by the log callback. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 741fa316038eb0307e4aaffcac05eaa36303ead9 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 20 11:38:24 2007 -0600 Remove abs from the pacman repository abs has always been an Arch Linux specific tool, and although it is used primarily by pacman and makepkg, it should not be included with a distro- agnostic tarball. In addition, maintenance of the script would be better outside of pacman and would allow for more frequent updates. This also facilitates our move away from a cvsup/csup dependent tool for syncing PKGBUILDs. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c0845db8f7cc3f0fbf9bfadbdbb30b0acc96c242 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Thu Dec 20 12:48:12 2007 +0100 Updated Hungarian translation 1 untranslated message translated and 1 message fixed Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8e53cea8f84332b394f503a8e6194c268e8283b1 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Dec 19 23:41:17 2007 -0600 Update PKGBUILD manpage to give info on scriptlet arguments Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 25072219b5c3d3824325b2b4439424a7ca89ba16 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Dec 19 23:40:25 2007 -0600 Fixes to allow make distcheck to work again Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 19 +- contrib/Makefile.am | 2 +- contrib/README | 4 +- doc/PKGBUILD.5.txt | 18 +- etc/Makefile.am | 4 - etc/abs/Makefile.am | 20 - etc/abs/abs.conf | 13 - etc/abs/supfile.community | 15 - etc/abs/supfile.core | 15 - etc/abs/supfile.extra | 15 - etc/abs/supfile.testing | 16 - etc/abs/supfile.unstable | 15 - lib/libalpm/delta.c | 6 +- lib/libalpm/po/LINGUAS | 1 + lib/libalpm/po/{libalpm.pot => cs_CZ.po} | 307 ++++---- lib/libalpm/po/fr.po | 710 ++++++++--------- lib/libalpm/po/hu.po | 23 +- lib/libalpm/sync.c | 8 + po/LINGUAS | 1 + po/POTFILES.in | 1 - po/{pacman.pot => cs_CZ.po} | 953 ++++++++++++----------- po/fr.po | 1234 ++++++++++++------------------ po/hu.po | 2 +- po/it.po | 25 +- scripts/.gitignore | 1 - scripts/Makefile.am | 6 - scripts/abs.sh.in | 171 ---- scripts/makepkg.sh.in | 8 - src/pacman/sync.c | 2 +- src/util/testdb.c | 3 +- 30 files changed, 1548 insertions(+), 2070 deletions(-) delete mode 100644 etc/abs/Makefile.am delete mode 100644 etc/abs/abs.conf delete mode 100644 etc/abs/supfile.community delete mode 100644 etc/abs/supfile.core delete mode 100644 etc/abs/supfile.extra delete mode 100644 etc/abs/supfile.testing delete mode 100644 etc/abs/supfile.unstable copy lib/libalpm/po/{libalpm.pot => cs_CZ.po} (62%) copy po/{pacman.pot => cs_CZ.po} (59%) delete mode 100644 scripts/abs.sh.in hooks/post-receive -- The official pacman repository

1 0