- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Italian translation fixes
by Giovanni Scafora 21 Dec '07

21 Dec '07

Hi guys, here's a small patch to fix the Italian translation of pacman 3.1 Thanks a lot. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

1 0

[pacman-dev] [PATCH] Updated Hungarian translation
by Nagy Gabor 20 Dec '07

20 Dec '07

From 27aeb4ac0b79b6381b03dcafd07bf4af30564b9b Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Thu, 20 Dec 2007 12:48:12 +0100 Subject: [PATCH] Updated Hungarian translation 1 untranslated message translated and 1 message fixed Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/po/hu.po | 23 ++++++++++++++--------- po/hu.po | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/lib/libalpm/po/hu.po b/lib/libalpm/po/hu.po index bb84891..5911459 100644 --- a/lib/libalpm/po/hu.po +++ b/lib/libalpm/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" -"POT-Creation-Date: 2007-12-12 14:27+0100\n" +"POT-Creation-Date: 2007-12-20 12:35+0100\n" "PO-Revision-Date: 2007-03-14 13:45+0100\n" "Last-Translator: Nagy Gabor <ngaba(a)bibl.u-szeged.hu>\n" "Language-Team: <hu(a)li.org>\n" @@ -172,7 +172,7 @@ msgstr "a(z) %s csomag saját %s függősége után lesz eltávolítva\n" msgid "%s will be installed before its %s dependency\n" msgstr "a(z) %s csomag saját %s függősége előtt lesz telepítve\n" -#: lib/libalpm/deps.c:573 +#: lib/libalpm/deps.c:584 #, c-format msgid "cannot resolve \"%s\", a dependency of \"%s\"\n" msgstr "nem sikerült a(z) \"%s\" csomag \"%s\" függőségét feloldani\n" @@ -398,37 +398,42 @@ msgstr "%s: a helyi (%s) újabb, mint %s (%s)\n" msgid "%s-%s: delaying upgrade of package (%s)\n" msgstr "%s-%s: a csomag frissítésének késleltetése (%s)\n" -#: lib/libalpm/package.c:1038 +#: lib/libalpm/package.c:1036 +#, c-format +msgid "error extracting package description file to %s\n" +msgstr "nem sikerült kicsomagolni a csomagleíró fájlt %s-ként\n" + +#: lib/libalpm/package.c:1042 #, c-format msgid "could not parse package description file in %s\n" msgstr "nem sikerült értelmezni a(z) %s csomagleíró fájlját\n" -#: lib/libalpm/package.c:1043 +#: lib/libalpm/package.c:1047 #, c-format msgid "missing package name in %s\n" msgstr "hiányzó csomagnév itt: %s\n" -#: lib/libalpm/package.c:1047 +#: lib/libalpm/package.c:1051 #, c-format msgid "missing package version in %s\n" msgstr "hiányzó csomagverzió itt: %s\n" -#: lib/libalpm/package.c:1077 +#: lib/libalpm/package.c:1081 #, c-format msgid "could not remove tempfile %s\n" msgstr "nem sikerült eltávolítani a %s ideiglenes fájlt\n" -#: lib/libalpm/package.c:1092 lib/libalpm/package.c:1105 +#: lib/libalpm/package.c:1096 lib/libalpm/package.c:1109 #, c-format msgid "error while reading package %s: %s\n" msgstr "hiba a(z) %s csomag olvasása közben: %s\n" -#: lib/libalpm/package.c:1112 +#: lib/libalpm/package.c:1116 #, c-format msgid "missing package metadata in %s\n" msgstr "hiányzó csomaginformációs fájl itt: %s\n" -#: lib/libalpm/package.c:1119 +#: lib/libalpm/package.c:1123 #, c-format msgid "missing package filelist in %s, generating one\n" msgstr "hiányzik a(z) %s csomag fájllistája, generálás\n" diff --git a/po/hu.po b/po/hu.po index 91a4350..e256982 100644 --- a/po/hu.po +++ b/po/hu.po @@ -974,7 +974,7 @@ msgstr "" #: src/pacman/sync.c:533 msgid ":: Cancel current operation? [Y/n] " -msgstr ":: Megszakítja a jelenlegi műveletet? [I/n]" +msgstr ":: Megszakítja a jelenlegi műveletet? [I/n] " #: src/pacman/sync.c:535 src/pacman/sync.c:721 #, c-format -- 1.5.3.7

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.6-689-g6058a22
by Dan McGee 20 Dec '07

20 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 6058a225b6753bd68d5d115ec444fc12effe4264 (commit) via d4f170623bfb4a4ecf66895f5b246652f958cf22 (commit) via ebae8bd009764fd7ad965c0f8444908e7a84e9eb (commit) via b06ce1e8adf9cb0f2a918b9234b2d3bd47c1789e (commit) via 13dd2864ca740ee7e6a6ce163c883dc24a294c87 (commit) via 47f4c5a480505e5ed6a0473f4f81ddf98df5e43a (commit) via a2cf4701eabc5d58ce4e074af3c67edfc503aca8 (commit) via 64fd3fd324e74a3d011f95acb16a87159aac03db (commit) from 16ed9ad19b505398c764f350318482b2a3d406bd (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 6058a225b6753bd68d5d115ec444fc12effe4264 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Dec 19 21:12:26 2007 -0600 More updates to the NEWS file (add bug numbers, etc.) Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d4f170623bfb4a4ecf66895f5b246652f958cf22 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Thu Dec 20 00:08:28 2007 +0100 Update french translation. Only the messages in pacman frontend were updated, and it's probably not perfect yet, but it's a start. There are 160 untranslated msg left for the scripts / tools. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit ebae8bd009764fd7ad965c0f8444908e7a84e9eb Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Thu Dec 20 00:05:03 2007 +0100 update of translation-help and fix a typo in gensync. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit b06ce1e8adf9cb0f2a918b9234b2d3bd47c1789e Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Dec 18 14:48:32 2007 +0100 Add PM_DEP_MOD_GT and PM_DEP_MOD_LT to documentation Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 13dd2864ca740ee7e6a6ce163c883dc24a294c87 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Dec 18 14:24:44 2007 +0100 PM_DEP_MOD_LT and PM_DEP_MOD_GT depmods added You can use foo<2.0 and foo>2.0 as depend add046.py and add047.py pactests were added to check this Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 47f4c5a480505e5ed6a0473f4f81ddf98df5e43a Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Wed Dec 12 14:36:57 2007 +0100 Updated Hungarian translation * Updated libalpm translation * Regenerated hu.po files, because the 'call-for-translators version' was outdated Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a2cf4701eabc5d58ce4e074af3c67edfc503aca8 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 18 20:32:06 2007 -0600 Change all bug references in NEWS to be 'FS#' references Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 64fd3fd324e74a3d011f95acb16a87159aac03db Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 18 20:24:40 2007 -0600 Initial updates to NEWS file for 3.1.0 release Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 125 ++- doc/PKGBUILD.5.txt | 5 +- lib/libalpm/alpm.h | 4 +- lib/libalpm/deps.c | 19 +- lib/libalpm/po/hu.po | 682 ++++----- pactest/tests/{depconflict111.py => add046.py} | 9 +- pactest/tests/{depconflict110.py => add047.py} | 9 +- po/fr.po | 1989 +++++++++++------------- po/hu.po | 905 ++++++------ scripts/gensync.sh.in | 2 +- translation-help | 29 +- 11 files changed, 1827 insertions(+), 1951 deletions(-) copy pactest/tests/{depconflict111.py => add046.py} (57%) copy pactest/tests/{depconflict110.py => add047.py} (58%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] PM_DEP_MOD_LT and PM_DEP_MOD_GT depmods added
by Nagy Gabor 20 Dec '07

20 Dec '07

From c0d82c952dd7fc59cdc478898025a21d9ecf03d6 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue, 18 Dec 2007 14:24:44 +0100 Subject: [PATCH] PM_DEP_MOD_LT and PM_DEP_MOD_GT depmods added You can use foo<2.0 and foo>2.0 as depend add046.py and add047.py pactests were added to check this Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/alpm.h | 4 +++- lib/libalpm/deps.c | 19 ++++++++++++++++++- pactest/tests/add046.py | 14 ++++++++++++++ pactest/tests/add047.py | 14 ++++++++++++++ 4 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 pactest/tests/add046.py create mode 100644 pactest/tests/add047.py diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index f64796c..3a484be 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -369,7 +369,9 @@ typedef enum _pmdepmod_t { PM_DEP_MOD_ANY = 1, PM_DEP_MOD_EQ, PM_DEP_MOD_GE, - PM_DEP_MOD_LE + PM_DEP_MOD_LE, + PM_DEP_MOD_GT, + PM_DEP_MOD_LT } pmdepmod_t; pmdepend_t *alpm_splitdep(const char *depstring); diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 1603f99..8d77fd4 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -310,6 +310,8 @@ static int dep_vercmp(const char *version1, pmdepmod_t mod, case PM_DEP_MOD_EQ: equal = (cmp == 0); break; case PM_DEP_MOD_GE: equal = (cmp >= 0); break; case PM_DEP_MOD_LE: equal = (cmp <= 0); break; + case PM_DEP_MOD_LT: equal = (cmp < 0); break; + case PM_DEP_MOD_GT: equal = (cmp > 0); break; default: equal = 1; break; } } @@ -374,10 +376,19 @@ pmdepend_t SYMEXPORT *alpm_splitdep(const char *depstring) depend->mod = PM_DEP_MOD_LE; *ptr = '\0'; ptr += 2; - } else if((ptr = strstr(newstr, "="))) { + } else if((ptr = strstr(newstr, "="))) { /* Note: we must do =,<,> checks after <=, >= checks */ depend->mod = PM_DEP_MOD_EQ; *ptr = '\0'; ptr += 1; + } else if((ptr = strstr(newstr, "<"))) { + depend->mod = PM_DEP_MOD_LT; + *ptr = '\0'; + ptr += 1; + } else if((ptr = strstr(newstr, ">"))) { + depend->mod = PM_DEP_MOD_GT; + *ptr = '\0'; + ptr += 1; + } else { /* no version specified - copy in the name and return it */ depend->mod = PM_DEP_MOD_ANY; @@ -684,6 +695,12 @@ char SYMEXPORT *alpm_dep_get_string(const pmdepend_t *dep) case PM_DEP_MOD_EQ: opr = "="; break; + case PM_DEP_MOD_LT: + opr = "<"; + break; + case PM_DEP_MOD_GT: + opr = ">"; + break; default: opr = ""; break; diff --git a/pactest/tests/add046.py b/pactest/tests/add046.py new file mode 100644 index 0000000..5f967cb --- /dev/null +++ b/pactest/tests/add046.py @@ -0,0 +1,14 @@ +self.description = "pkg2<2.0 dependency (satisfy)" + +p = pmpkg("pkg1") +p.depends = ["pkg2<2.0"] +self.addpkg(p) + +lp = pmpkg("pkg2", "1.9b-3") +self.addpkg2db("local", lp) + +self.args = "-A %s" % p.filename() + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") +self.addrule("PKG_EXIST=pkg2") diff --git a/pactest/tests/add047.py b/pactest/tests/add047.py new file mode 100644 index 0000000..153364a --- /dev/null +++ b/pactest/tests/add047.py @@ -0,0 +1,14 @@ +self.description = "pkg2<2.0 dependency (not satisfy)" + +p = pmpkg("pkg1") +p.depends = ["pkg2<2.0"] +self.addpkg(p) + +lp = pmpkg("pkg2", "2.0-3") +self.addpkg2db("local", lp) + +self.args = "-A %s" % p.filename() + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("PKG_EXIST=pkg2") -- 1.5.3.7

5 12

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.6-681-g16ed9ad
by Dan McGee 19 Dec '07

19 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 16ed9ad19b505398c764f350318482b2a3d406bd (commit) via a4b81387974e6b36c6fbc541b543d6d67882eadd (commit) via e5cdac7d48cb0bb4c3df6a4e0d1e84c195ff2b54 (commit) via a11b2065afd4e949006fa68c021a2ef60ed27d96 (commit) via ce424a356f73e99fe2247a0d18437399f0e8c5e9 (commit) via 20bad3b839ad3d43d477e80d66df8149d2935ab7 (commit) from f5478d68a67741236a2e9f42f2e524ee1bb26517 (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 16ed9ad19b505398c764f350318482b2a3d406bd Author: Giovanni Scafora <linuxmania(a)gmail.com> Date: Tue Dec 18 22:54:48 2007 +0100 Updated Italian Translation Signed-off-by: Giovanni Scafora <linuxmania(a)gmail.com> modified: lib/libalpm/po/it.po modified: po/it.po Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a4b81387974e6b36c6fbc541b543d6d67882eadd Author: Aaron Griffin <aaronmgriffin(a)gmail.com> Date: Fri Dec 14 11:35:46 2007 -0600 Allow unreadable Include files to be non-fatal Signed-off-by: Aaron Griffin <aaronmgriffin(a)gmail.com> [Dan: remove unused variable, make parseconfig static] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e5cdac7d48cb0bb4c3df6a4e0d1e84c195ff2b54 Author: Allan McRae <mcrae_allan(a)hotmail.com> Date: Mon Dec 10 12:57:54 2007 +1000 Only query pacman upgrade when performing actual upgrade Fixes FS#7147. Do not ask about upgrading pacman when -w and -p flags are used. Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a11b2065afd4e949006fa68c021a2ef60ed27d96 Author: Giovanni Scafora <linuxmania(a)gmail.com> Date: Sun Dec 16 10:17:33 2007 +0100 Updated Italian Translation for pacman 3.1 Signed-off-by: Giovanni Scafora <linuxmania(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ce424a356f73e99fe2247a0d18437399f0e8c5e9 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Dec 16 22:45:01 2007 -0600 Check for errors on descfile extraction If /tmp was full during the early stages of package extraction, we were unable to extract the package description file with the call to archive_read_data_into_fd(archive, fd) becuase we never checked the return code. Add a check to ensure the extraction was successful and print and return an error if it was not instead of falling through to a possibly untrue error message. This should fix FS #8885. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 20bad3b839ad3d43d477e80d66df8149d2935ab7 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Dec 16 22:00:12 2007 -0600 Set the default packager to "Unknown Packager" There is no real reason to make it look like someone that can't bother to set the packager variable is official in any way, so remove the Arch Linux reference from makepkg. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/package.c | 6 +- lib/libalpm/po/it.po | 316 ++++++++++--------- po/it.po | 839 ++++++++++++++++++++++++------------------------- scripts/makepkg.sh.in | 2 +- src/pacman/pacman.c | 9 +- src/pacman/sync.c | 74 +++--- 6 files changed, 625 insertions(+), 621 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Updated Italian Translation
by Giovanni Scafora 19 Dec '07

19 Dec '07

Hi guys, I apologize to you, but we have another patch to fix 1 fuzzy message into libalpm and some general improvements to the italian translation. Thanks a lot. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

1 0

[pacman-dev] [PATCH] Add PM_DEP_MOD_GT and PM_DEP_MOD_LT to documentation
by Nagy Gabor 18 Dec '07

18 Dec '07

From ef8f4ca925cee8472aebffc9afc0f0837566cc81 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue, 18 Dec 2007 14:48:32 +0100 Subject: [PATCH] Add PM_DEP_MOD_GT and PM_DEP_MOD_LT to documentation Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- doc/PKGBUILD.5.txt | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index b3ea4c9..1ebf4a6 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -117,8 +117,9 @@ Options and Directives An array of packages that this package depends on to run. Packages in this list should be surrounded with single quotes and contain at least the package name. Entries can also include a version requirement of the - form 'name<>version', where <> is one of three comparisons: >= (greater - than or equal to), <= (less than or equal to), or = (equal to). + form 'name<>version', where <> is one of five comparisons: >= (greater + than or equal to), <= (less than or equal to), = (equal to), > (greater + than), or < (less than). *makedepends (array)*:: An array of packages that this package depends on to build, but are not -- 1.5.3.7

1 0

[pacman-dev] Problem compiling pacman 3.0.6-2
by Karolina 18 Dec '07

18 Dec '07

It appears that pacman needs /usr/lib/libattr.la but the package "attr" has options=('!libtool') and does not provide that file. Setting options=('libtool') for the package "attr" solves the problem, but I don't know if that is the correct solution. Karolina

3 4

[pacman-dev] foo<2.0 dependency
by Nagy Gabor 17 Dec '07

17 Dec '07

Hi! First I refer to this old mail: http://www.archlinux.org/pipermail/pacman-dev/2007-July/008701.html (s/depend/requiredby in that subject <- this 'audacious-plugins depends on audacious logic' is so confusing to me;-) So how can we "predict" the future? A possible solution (from crazy@FW) we use foo<2.0 dependency of bar, which indicates that only foo 1.x dependency is expected to work with bar. For example, then the packager can add both foo>=1.3 and foo<1.4 dependencies to his bar 1.3 package (foo 1.4 may work, but probably won't). And this will prevent users from upgrading foo 1.3 to foo 1.4 without dependency break (see the confusing audacious example above: audacious-plugins 1.3.5 is not expected to work with audacious-player 1.4.x). So my definition of foo<2.0: foo<=2.0 holds, but foo=2.0 doesn't. Bye, ngaba PS: I don't know whether foo>1.0 would be useful or not, maybe with conflicts only (<- predicted conflict ;-), but if we implemented '<', then probably we would implement '>' to enjoy the symmetry.

2 1

[pacman-dev] Package name and version check
by Nagy Gabor 17 Dec '07

17 Dec '07

Hi! I refer to this thread: http://www.archlinux.org/pipermail/pacman-dev/2007-November/010252.html Well, I agree with Dan and Aaron, quote: "Maybe I want my packages just named pkgname.lol". However, I don't see the clear rules, where (pkgname,pkgver) comes from in case of repos. I would like make a little comment here: Packages in sync (and local) dbs are identified by their directory names, not by %NAME% and %VERSION% in desc (reason: speed-up): see line 220 in be_files.c: if(_alpm_db_splitname(ent->d_name, pkg->name, pkg->version) != 0)... So we should make sure, that directory name contains the valid %NAME% and %VERSION% (or %NAME% and %VERSION% is not needed in desc) And of course %FILENAME% should point to a package with the correct %NAME% and %VERSION% <- we may want to check the .PKGINFO content of the (downloaded) pointed file, not the filename itself. However, I'm not sure if this is needed: then we should also check %DEPENDS%, %PROVIDES% and other fields... (checkdeps might have been fooled for example) Bye

3 2