- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] [Translation] Call for translations for 3.1 release
by Dan McGee 21 Dec '07

21 Dec '07

This is an announcement to all you on this list who wants to help out and make pacman available to your native language. I made a commit tonight <http://projects.archlinux.org/git/?p=pacman.git;a=commit;h=3170106149ce21d3…> that updated all of our existing translations, and we have quite a few out of date messages. I've pasted the output below, slightly simplified so its readable. Entering directory `/home/dmcgee/projects/pacman/lib/libalpm/po' de.po 51 translated messages, 76 fuzzy translations, 18 untranslated messages. en_GB.po 125 translated messages, 9 fuzzy translations, 11 untranslated messages. es.po 49 translated messages, 78 fuzzy translations, 18 untranslated messages. fr.po 49 translated messages, 78 fuzzy translations, 18 untranslated messages. hu.po 51 translated messages, 76 fuzzy translations, 18 untranslated messages. it.po 125 translated messages, 9 fuzzy translations, 11 untranslated messages. pl_PL.po 49 translated messages, 78 fuzzy translations, 18 untranslated messages. pt_BR.po 16 translated messages, 46 fuzzy translations, 83 untranslated messages. ru_RU.po ru_RU.po:7: headerfield `Language-Team' missing in header 30 translated messages, 65 fuzzy translations, 50 untranslated messages. Entering directory `/home/dmcgee/projects/pacman/po' de.po 105 translated messages, 136 fuzzy translations, 200 untranslated messages. en_GB.po 400 translated messages, 37 fuzzy translations, 4 untranslated messages. es.po 95 translated messages, 134 fuzzy translations, 212 untranslated messages. fr.po 98 translated messages, 150 fuzzy translations, 193 untranslated messages. hu.po 166 translated messages, 37 fuzzy translations, 238 untranslated messages. it.po 400 translated messages, 37 fuzzy translations, 4 untranslated messages. pl_PL.po 98 translated messages, 142 fuzzy translations, 201 untranslated messages. pt_BR.po 98 translated messages, 142 fuzzy translations, 201 untranslated messages. ru_RU.po 98 translated messages, 142 fuzzy translations, 201 untranslated messages. Note that the huge untranslated message count is due to all of the scripts being gettext-ed. Please don't be intimidated by this- if you don't want to translate the scripts right now, then feel free to skip them. If I was deciding priorities: 1. Ensure all of the pacman proper (not libalpm) messages are translated. 2. Ensure all of the libalpm messages are translated. 3. Ensure all of the makepkg messages are translated. 4. Translate anything else. I will take any patch or correction, even if you don't have time to do it all- so feel free to send your updates in on the list! Please prefix any email with [Translation]; although [Patch] will be fine as well if you are mailing straight from GIT. Read the commit message above, the 'translation-help' file in the GIT repo, or join us in #archlinux-pacman if you have any questions. -Dan

7 12

[pacman-dev] Czech translation
by Vojtěch Gondžala 21 Dec '07

21 Dec '07

Hi all, here is a complete czech translation for pacman and libalpm --vogo

1 0

[pacman-dev] directories symlinks removal
by Xavier 21 Dec '07

21 Dec '07

cddb_get 2.27-1 package contains the following directories : /usr/lib/perl5/5.8.8/ /usr/lib/perl5/site_perl/5.8.8/ These 5.8.8 directories are normally symlinks to current/ on the filesystem. When removing this package, or upgrading it to 2.27-2, the following errors show up: error: cannot remove file 'usr/lib/perl5/site_perl/5.8.8/': Not a directory error: cannot remove file 'usr/lib/perl5/5.8.8/': Not a directory That's related to commit b55abdce7 (also see 2898ccb) pacman now does a alpm_lstat of usr/lib/perl5/site_perl/5.8.8/, which does a lstat of usr/lib/perl5/5.8.8 , which gives a symlink. Then it tries to unlink(usr/lib/perl5/5.8.8/), which results in the above error. I wonder if we shouldn't just revert to a simple lstat usage here.

2 1

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

20 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@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 19 Dec '07

19 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