- Pacman-dev - lists.archlinux.org

[pacman-dev] Move -Sw to front-end
by Nagy Gabor 26 Aug '08

26 Aug '08

Hi! After moving -Sp to front-end I decided to move -Sw as well, thus we would reach the following goal: alpm_trans_commit represents a _real_ transaction, ie. its successful run will cause a localdb change. It would make our code much more understandable, for example we could simply move ldconfig call to trans_commit (this would fix the duplicated ldconfig run issue on -Su %REPLACES%) and this would be helpful in my refresh_pkgcache branch etc. The reason for not providing a patch, I couldn't decide how to make this "download part" public. (This should be factorised from sync_commit). I put some ideas/opinions here, some of them may be conflicting. I appreciate any feedback. 1. Pre-condition: download callback stuffs are attached to handle, not to trans. Cool, "nice" transaction independent download stuff is possible. 2. First I thought something like this: alpm_download_packages(alpm_list_t *packages, ...) This seems the easiest to implement (cut from sync_commit). However, if we want transaction-independent function, we should do pmsyncpkg_t -> pmpkg_t conversion always. (Ugly) 3. Then I started to like the following: alpm_download_package(pmpkg_t *package) We have a problem with this, in this case if we want to keep the current "download all packages then check all integrity" order we should make something like alpm_check_integrity public (no, too complicated). Alternatively, we could check_integrity in download_package. This is also logical, but changes the current behaviour (order). Either 2. or 3. seems easy first. But there is a very minor thing, I want to fix, which makes our life more difficult: delta_path and download_size (of pmpkg_t) 4. First I thought, that these shouldn't belong to pmpkg_t, because they are not "constant" package properties like packager etc. These depend on the actual state of the download cache. I started to like the idea of moving them to pmsyncpkg_t instead. (Btw, alpm_pkg_download_size is in sync.c) But this just broke my plan to make transaction independent download stuff, so this idea was dropped. 5. These two fields are computed by compute_download_size as a last step of sync_prepare. If front-end is allowed to download some packages manually, then we should update these fields automatically. (these fields are used by determining the to-be-downloaded files) Even if we drop "-Sw in front-end" idea, it would nice, if these (or at least the public download_size) fields were "on-demand" stuffs, like other fields of pmpkg_t (new infolevel?, or download_size = -1 for "not yet computed"?): not hardwired sync_prepare computing, and automatically update the field if needed. (Because the front-end is allowed to request download_size field between sync_addtarget and sync_prepare etc.) However, if we want to update these fields after successful download, we should completely restructure the current download stuff (atm we just collect files then download them, and forget about packages):-/ I may mixed many things here, and I may misunderstand something (this delta stuff made things quite complicated in sync.c) So I decided to rework this download part, but I am unsure about directions. Bye

2 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.0-50-gd05882d
by dan＠archlinux.org 26 Aug '08

26 Aug '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 d05882db9e417244fa580c4697b45333faffcc79 (commit) via 070135626023caa0186a77f9f846c078e3cf1be8 (commit) via 9dbe5c9d1ee5fb00f25515dfb5a2feb3ae6ebd59 (commit) via a06d0de104d2f03c19b917ea47394d8d6be89a9a (commit) from a4100b384737d6b422a31eb0f6614b4f5f6070cb (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 d05882db9e417244fa580c4697b45333faffcc79 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Aug 17 19:36:28 2008 +0200 Rename alpm_db_get{pkg,grp}cache to alpm_db_get_{pkg,grp}cache This is more consistent with the private functions : _alpm_db_get_{pkg,grp}cache Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 070135626023caa0186a77f9f846c078e3cf1be8 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Aug 17 19:30:36 2008 +0200 Change checkdeps and checkdbconflicts to be more flexible. These two functions now take directly a package list rather than a database. checkdbconflicts was renamed to checkconflicts. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> commit 9dbe5c9d1ee5fb00f25515dfb5a2feb3ae6ebd59 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Aug 24 02:29:10 2008 +0200 pacman : smarter optdepends handling. During an upgrade, only the new optdepends will be displayed, to only keep the useful information and not clutter pacman output too much. The whole optdepends list is always available with -Si / -Qi. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a06d0de104d2f03c19b917ea47394d8d6be89a9a Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sun Aug 24 01:51:56 2008 +0200 makepkg.conf : some info / docs adjustements After commit 7865fb9af487, info pages are now treated like man pages. This means even with !docs, info pages will still be included. And including info pages was the main reason the docs option was enabled by default recently. So this is now longer needed, and we can revert back to !docs by default for disabling gigantic html pages and other docs. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.conf.5.txt | 7 ++++--- etc/makepkg.conf.in | 6 +++--- lib/libalpm/add.c | 2 +- lib/libalpm/alpm.h | 8 ++++---- lib/libalpm/conflict.c | 6 +++--- lib/libalpm/db.c | 4 ++-- lib/libalpm/deps.c | 12 ++++-------- lib/libalpm/remove.c | 6 +++--- lib/libalpm/sync.c | 2 +- src/pacman/callback.c | 2 +- src/pacman/query.c | 8 ++++---- src/pacman/sync.c | 12 ++++++------ src/pacman/util.c | 19 +++++++++++++++++++ src/pacman/util.h | 1 + src/util/testdb.c | 5 +++-- 15 files changed, 59 insertions(+), 41 deletions(-) hooks/post-receive -- The official pacman repository

4 5

[pacman-dev] [PATCH] testdb : extend the tool to allow checking sync dbs too.
by Xavier Chantry 26 Aug '08

26 Aug '08

Example usage and output : > src/util/testdb -h usage: testdb [-b <pacman db>] : check the local database testdb [-b <pacman db>] core extra ... : check the listed sync databases > src/util/testdb Checking the integrity of the local database in /var/lib/pacman/ > src/util/testdb core extra testing community Checking the integrity of the sync databases in /var/lib/pacman/ missing dependency for archboot : bcm43xx-fwcutter>=006-2 missing dependency for xvattr : xfree86 missing dependency for eclipse-ve : eclipse<3.3 missing dependency for flumotion : twisted-web missing dependency for gg2 : arts missing dependency for man-pages-cs : groff-utf8 missing dependency for qc-usb : kernel26<2.6.26 Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> --- src/util/testdb.c | 174 ++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 126 insertions(+), 48 deletions(-) diff --git a/src/util/testdb.c b/src/util/testdb.c index 69e3519..8a66819 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -56,7 +56,7 @@ void output_cb(pmloglevel_t level, char *fmt, va_list args) } } -static int db_test(char *dbpath) +static int db_test(char *dbpath, int local) { struct dirent *ent; char path[PATH_MAX]; @@ -70,7 +70,8 @@ static int db_test(char *dbpath) } while ((ent = readdir(dir)) != NULL) { - if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) { + if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..") + || ent->d_name[0] == '.') { continue; } /* check for desc, depends, and files */ @@ -84,58 +85,22 @@ static int db_test(char *dbpath) printf("%s: dependency file is missing\n", ent->d_name); ret++; } - snprintf(path, PATH_MAX, "%s/%s/files", dbpath, ent->d_name); - if(access(path, F_OK)) { - printf("%s: file list is missing\n", ent->d_name); - ret++; + if(local) { + snprintf(path, PATH_MAX, "%s/%s/files", dbpath, ent->d_name); + if(access(path, F_OK)) { + printf("%s: file list is missing\n", ent->d_name); + ret++; + } } } return(ret); } -int main(int argc, char **argv) +int checkdeps(alpm_list_t *pkglist) { - int retval = 0; /* default = false */ - pmdb_t *db = NULL; - char *dbpath; - char localdbpath[PATH_MAX]; - alpm_list_t *i; - - if(argc == 1) { - dbpath = DBPATH; - } else if(argc == 3 && strcmp(argv[1], "-b") == 0) { - dbpath = argv[2]; - } else { - fprintf(stderr, "usage: %s -b <pacman db>\n", BASENAME); - return(1); - } - - snprintf(localdbpath, PATH_MAX, "%s/local", dbpath); - retval = db_test(localdbpath); - if(retval) { - return(retval); - } - - if(alpm_initialize() == -1) { - fprintf(stderr, "cannot initialize alpm: %s\n", alpm_strerrorlast()); - return(1); - } - - /* let us get log messages from libalpm */ - alpm_option_set_logcb(output_cb); - - alpm_option_set_dbpath(dbpath); - - db = alpm_db_register_local(); - if(db == NULL) { - fprintf(stderr, "error: could not register 'local' database (%s)\n", - alpm_strerrorlast()); - cleanup(EXIT_FAILURE); - } - + alpm_list_t *data, *i; + int ret = 0; /* check dependencies */ - alpm_list_t *data; - alpm_list_t *pkglist = alpm_db_get_pkgcache(db); data = alpm_checkdeps(pkglist, 0, NULL, pkglist); for(i = data; i; i = alpm_list_next(i)) { pmdepmissing_t *miss = alpm_list_getdata(i); @@ -144,17 +109,130 @@ int main(int argc, char **argv) printf("missing dependency for %s : %s\n", alpm_miss_get_target(miss), depstring); free(depstring); + ret++; } + return(ret); +} +int checkconflicts(alpm_list_t *pkglist) +{ + alpm_list_t *data, *i; + int ret = 0; /* check conflicts */ data = alpm_checkconflicts(pkglist); for(i = data; i; i = i->next) { pmconflict_t *conflict = alpm_list_getdata(i); printf("%s conflicts with %s\n", alpm_conflict_get_package1(conflict), alpm_conflict_get_package2(conflict)); + ret++; + } + return(ret); +} + +int check_localdb(char *dbpath) { + char localdbpath[PATH_MAX]; + int ret = 0; + pmdb_t *db = NULL; + alpm_list_t *pkglist; + + snprintf(localdbpath, PATH_MAX, "%s/local", dbpath); + ret = db_test(localdbpath, 1); + if(ret) { + return(ret); + } + + db = alpm_db_register_local(); + if(db == NULL) { + fprintf(stderr, "error: could not register 'local' database (%s)\n", + alpm_strerrorlast()); + cleanup(EXIT_FAILURE); + } + pkglist = alpm_db_get_pkgcache(db); + ret += checkdeps(pkglist); + ret += checkconflicts(pkglist); + return(ret); +} + +int check_syncdbs(char *dbpath, alpm_list_t *dbnames) { + char syncdbpath[PATH_MAX]; + int ret = 0; + pmdb_t *db = NULL; + alpm_list_t *i, *pkglist, *syncpkglist = NULL; + + for(i = dbnames; i; i = alpm_list_next(i)) { + char *dbname = alpm_list_getdata(i); + snprintf(syncdbpath, PATH_MAX, "%s/sync/%s", dbpath, dbname); + ret = db_test(syncdbpath, 0); + if(ret) { + return(ret); + } + db = alpm_db_register_sync(dbname); + if(db == NULL) { + fprintf(stderr, "error: could not register sync database (%s)\n", + alpm_strerrorlast()); + cleanup(EXIT_FAILURE); + } + pkglist = alpm_db_get_pkgcache(db); + syncpkglist = alpm_list_join(syncpkglist, alpm_list_copy(pkglist)); + } + ret += checkdeps(syncpkglist); + alpm_list_free(syncpkglist); + + alpm_db_unregister_all(); + return(ret); +} + +void usage() { + fprintf(stderr, "usage:\n"); + fprintf(stderr, + "\t%s [-b <pacman db>] : check the local database\n", BASENAME); + fprintf(stderr, + "\t%s [-b <pacman db>] core extra ... : check the listed sync databases\n", BASENAME); + exit(1); +} + +int main(int argc, char **argv) +{ + int ret = 0; + char *dbpath = DBPATH; + int a = 1; + alpm_list_t *dbnames = NULL; + + while(a < argc) { + if(strcmp(argv[a], "-b") == 0) { + if(++a < argc) { + dbpath = argv[a]; + } else { + usage(); + } + } else if(strcmp(argv[a], "-h") == 0 || + strcmp(argv[a], "--help") == 0 ) { + usage(); + } else { + dbnames = alpm_list_add(dbnames, argv[a]); + } + a++; + } + + if(alpm_initialize() == -1) { + fprintf(stderr, "cannot initialize alpm: %s\n", alpm_strerrorlast()); + return(1); + } + + /* let us get log messages from libalpm */ + alpm_option_set_logcb(output_cb); + + alpm_option_set_dbpath(dbpath); + + if(!dbnames) { + printf("Checking the integrity of the local database in %s\n",dbpath); + ret = check_localdb(dbpath); + } else { + printf("Checking the integrity of the sync databases in %s\n",dbpath); + ret = check_syncdbs(dbpath,dbnames); } - cleanup(retval); + cleanup(ret); } /* vim: set ts=2 sw=2 noet: */ -- 1.6.0.1

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.0-44-g8263bd0
by dan＠archlinux.org 25 Aug '08

25 Aug '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 8263bd0cc260399b70c0cf36028c523de110b610 (commit) via d6f62ba22d5c6da484f4a7f0876b203ad545342a (commit) via 24d7c6a372ee9e796b4112f6dbff5f188fc80d35 (commit) via ece3d3606ac273fb3e032dcffee82458deb0cd72 (commit) via 81853893a53a1f31061d30efc01a0e420359de0a (commit) via eeb3c6868cc26a57015e692dde4f4217111e4fcc (commit) via cfc52dad98b130d882970392952b8fd4625ae7a5 (commit) via 49c58ce9db70dc06d16ef56d0bafc64a9f38f141 (commit) via 08b0fb856dab2d8c09622a4b95bd250f77b21539 (commit) via 6f38cedd8d55eb92a9ab417a747ca380b426efc0 (commit) from 68e59ecbaf5ab4b0ba8684ea8ce29ef90df84d7a (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 8263bd0cc260399b70c0cf36028c523de110b610 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 25 18:23:57 2008 -0500 Updates in preparation for 3.2.1 release Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d6f62ba22d5c6da484f4a7f0876b203ad545342a Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat Aug 23 16:34:42 2008 +0200 makepkg : allow to specify a download filename A source entry can now have the following form, to specify a different filename : "filename::http://path/to/file" Of course, the old syntax is still supported : "http://path/to/file" And as before, in the second case, the filename used is simply "file". This fixes FS#11292, because handling multiple source files with the same name is now possible (just choose a different filename). But it will also allow to deal much more nicely with funny url like this by using a sane filename (and unfortunately, there are quite a few) : http://www.vim.org/scripts/download_script.php?src_id=6992 Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 24d7c6a372ee9e796b4112f6dbff5f188fc80d35 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon Aug 25 22:56:51 2008 +0200 Final updates on all translation for 3.2.1 * Update all .po files because of the last "-q,--quiet" fix. Also for some strange reason, en_GB was missing a few c-format tags. * Finally, delete all unused translations. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ece3d3606ac273fb3e032dcffee82458deb0cd72 Author: Roman Kyrylych <roman.kyrylych(a)gmail.com> Date: Mon Aug 25 20:00:45 2008 +0200 Add missing comma to -S --help message Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 81853893a53a1f31061d30efc01a0e420359de0a Author: Hugo Doria <hugo(a)archlinux.org> Date: Sun Aug 24 17:00:22 2008 +0200 Update Portuguese (Brazil) translation Xav : alignment fixes commit eeb3c6868cc26a57015e692dde4f4217111e4fcc Author: Samed Beyribey <ras0ir(a)eventualis.org> Date: Mon Aug 25 08:28:46 2008 +0200 Update Turkish translation commit cfc52dad98b130d882970392952b8fd4625ae7a5 Author: 甘露(Lu.Gan) <rhythm.gan(a)gmail.com> Date: Sun Aug 24 13:50:48 2008 +0200 Update Chinese Simplified translation commit 49c58ce9db70dc06d16ef56d0bafc64a9f38f141 Author: Vojtěch Gondžala <vojtech.gondzala(a)gmail.com> Date: Sun Aug 24 13:59:42 2008 +0200 Update Czech translation commit 08b0fb856dab2d8c09622a4b95bd250f77b21539 Author: Matthias Gorissen <matthias(a)archlinux.de> Date: Sun Aug 24 13:56:28 2008 +0200 Update German translation commit 6f38cedd8d55eb92a9ab417a747ca380b426efc0 Author: Sergey Tereschenko <serg.partizan(a)gmail.com> Date: Sun Aug 24 01:58:45 2008 +0200 Update Russian translation [Xav: one minor fix to libalpm po file] ----------------------------------------------------------------------- Summary of changes: NEWS | 19 ++++++++++- TRANSLATORS | 2 +- configure.ac | 6 ++-- doc/PKGBUILD.5.txt | 4 ++ doc/makepkg.conf.5.txt | 13 ++++---- lib/libalpm/po/cs.po | 10 ++---- lib/libalpm/po/de.po | 8 ++--- lib/libalpm/po/en_GB.po | 2 - lib/libalpm/po/es.po | 2 - lib/libalpm/po/fr.po | 2 - lib/libalpm/po/pl.po | 2 - lib/libalpm/po/pt_BR.po | 8 ++--- lib/libalpm/po/ru.po | 8 ++--- lib/libalpm/po/tr.po | 10 ++---- lib/libalpm/po/zh_CN.po | 10 ++---- po/cs.po | 34 ++++++++------------- po/de.po | 37 ++++++++++------------ po/en_GB.po | 12 ++----- po/es.po | 11 +------ po/fr.po | 6 +--- po/hu.po | 8 +---- po/it.po | 6 +--- po/pacman.pot | 6 +--- po/pl.po | 7 +---- po/pt_BR.po | 77 ++++++++++++++++++++-------------------------- po/ru.po | 42 ++++++++++---------------- po/tr.po | 34 ++++++++------------- po/zh_CN.po | 32 ++++++++----------- scripts/makepkg.sh.in | 65 +++++++++++++++++++++++++++------------ src/pacman/pacman.c | 2 +- 30 files changed, 215 insertions(+), 270 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Add a space before hyphen
by Roman Kyrylych 25 Aug '08

25 Aug '08

From b7c804ea5b9debb4266d2ce63a42505132506052 Mon Sep 17 00:00:00 2001 From: Roman Kyrylych <roman(a)vostro.localdomain> Date: Mon, 25 Aug 2008 17:47:26 +0300 Subject: [PATCH] Add a space before hyphen Signed-off-by: Roman Kyrylych <roman(a)vostro.localdomain> --- src/pacman/pacman.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 155f8da..0df3088 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -624,7 +624,7 @@ static int _parseconfig(const char *file, const char *givensection, strtrim(ptr); if(key == NULL) { - pm_printf(PM_LOG_ERROR, _("config file %s, line %d: syntax error in config file- missing key.\n"), + pm_printf(PM_LOG_ERROR, _("config file %s, line %d: syntax error in config file - missing key.\n"), file, linenum); return(1); } -- 1.6.0 -- Roman Kyrylych (Роман Кирилич)

2 1

[pacman-dev] [translation] pt-br translation for 3.2.1
by Hugo Doria 25 Aug '08

25 Aug '08

And here it goes the pt-br translation for 3.2.1. -- Hugo

3 7

[pacman-dev] [PATCH] Add a couple of missing commas to help messages
by Roman Kyrylych 25 Aug '08

25 Aug '08

Hi! Here's a fix for cosmethic bugs I found during translating pacman. From 3784d9cb45bc96d8d6d0120a89c1f24e58f60ee6 Mon Sep 17 00:00:00 2001 From: Roman Kyrylych <roman(a)vostro.localdomain> Date: Mon, 25 Aug 2008 17:20:03 +0300 Subject: [PATCH] Added a couple of missing commas to help messages Signed-off-by: Roman Kyrylych <roman(a)vostro.localdomain> --- po/pacman.pot | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/pacman.pot b/po/pacman.pot index 5c64a57..039e671 100644 --- a/po/pacman.pot +++ b/po/pacman.pot @@ -292,7 +292,7 @@ msgstr "" #, c-format msgid "" "\n" -"use '%s {-h --help}' with an operation for available options\n" +"use '%s {-h, --help}' with an operation for available options\n" msgstr "" #, c-format @@ -449,7 +449,7 @@ msgid "" msgstr "" #, c-format -msgid " -q --quiet show less information for query and search\n" +msgid " -q, --quiet show less information for query and search\n" msgstr "" #, c-format -- 1.6.0 -- Roman Kyrylych (Роман Кирилич)

3 3

[pacman-dev] Pacman 3.2.1 string freeze
by Dan McGee 25 Aug '08

25 Aug '08

String freeze for the pacman 3.2.1 release is now in effect. We have about 10 messages per language that are either fuzzy or new in this release, so nothing too serious. I've made some of the easy updates myself for your convenience: "Description:" -> remove the space "None" -> remove the '\n' "downloading %s\n" -> copy from the "Downloading %s" text if it was obvious to me "Are you sure" makepkg question -> remove the "[Y/n]" text Our pacman translation policy is outlined here. The important sections for translators are the introduction and up to (and including) pre-release updates. http://www.archlinux.org/pacman/translation-help.html As stated in the above document, PO files have been made available to translate: http://code.toofishes.net/pacman/po_files/ I'm shooting for a midweek release, so we have about 4 days to get translation updates in. Languages we currently have: cs:Vojtěch Gondžala <vojtech.gondzala(a)gmail.com> de: Matthias Gorissen <matthias(a)archlinux.de> en_GB: Jeff Bailes <thepizzaking(a)gmail.com> (Already complete) es: Juan Pablo Gonzalez <jotapesan(a)gmail.com> fr: Xavier Chantry <shiningxc(a)gmail.com> hu: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> it: Giovanni Scafora <linuxmania(a)gmail.com> pl: Mateusz Herych <heniekk(a)gmail.com> pt_BR: Hugo Doria <hugo(a)archlinux.org> ru: Sergey Tereschenko <serg.partizan(a)gmail.com> tr: Samed Beyribey <beyribey(a)gmail.com> zh_CN: 甘露(Lu.Gan) <rhythm.gan(a)gmail.com> If you wish to help translate, but your language is already listed as handled by someone, please contact them at the above addresses. If the language is listed as "no current translator", then please reply to ALL on this message stating you are doing the translation so we do not have duplicated effort (although you are more than welcome to work in teams). Once you have updated or completed a translation, simply tar and gzip the files up and send them back to pacman-dev(a)archlinux.org with a [translation] prefix in the message. For those that are used to the old method of updating translations (GIT patches), those are still acceptable as well. Please prefix the patch with "translation:" so it can be picked out easily. Any questions should be answered if you reply to this email on the list. -Dan

4 6

[pacman-dev] [Translation] Chinese Simplified
by 甘露(Lu Gan) 25 Aug '08

25 Aug '08

Done.

2 2

[pacman-dev] [PATCH] HoldPkg rework
by Nagy Gabor 24 Aug '08

24 Aug '08

From f6af53eed61c3088d756cba021b03266a0702ce8 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun, 24 Aug 2008 23:24:53 +0200 Subject: [PATCH] HoldPkg rework The HoldPkg feature is even more important when the packages to be held are pulled automatically by pacman, in a -Rc and -Rs operation. Before, it only applied when the packages were explicitly requested by the user to be removed. This patch extends holdpkg to -Rc and -Rs by doing the HoldPkg check just before trans_commit. Additionally, the whole HoldPkg stuff was moved to the front-end. I changed the default behavior to "don't remove", so I modified remove030.py pactest as well. See also: FS#9173. Original-work-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/alpm.h | 10 +--------- lib/libalpm/error.c | 3 --- lib/libalpm/handle.c | 32 -------------------------------- lib/libalpm/handle.h | 1 - lib/libalpm/remove.c | 10 ---------- pactest/tests/remove030.py | 6 ++---- src/pacman/callback.c | 4 ---- src/pacman/conf.c | 2 ++ src/pacman/conf.h | 1 + src/pacman/pacman.c | 7 ++++++- src/pacman/remove.c | 15 +++++++++++++++ 11 files changed, 27 insertions(+), 64 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index cdceaf0..7ef6a81 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -132,11 +132,6 @@ void alpm_option_add_ignorepkg(const char *pkg); void alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs); int alpm_option_remove_ignorepkg(const char *pkg); -alpm_list_t *alpm_option_get_holdpkgs(); -void alpm_option_add_holdpkg(const char *pkg); -void alpm_option_set_holdpkgs(alpm_list_t *holdpkgs); -int alpm_option_remove_holdpkg(const char *pkg); - alpm_list_t *alpm_option_get_ignoregrps(); void alpm_option_add_ignoregrp(const char *grp); void alpm_option_set_ignoregrps(alpm_list_t *ignoregrps); @@ -378,9 +373,7 @@ typedef enum _pmtransconv_t { PM_TRANS_CONV_REPLACE_PKG = 0x02, PM_TRANS_CONV_CONFLICT_PKG = 0x04, PM_TRANS_CONV_CORRUPTED_PKG = 0x08, - PM_TRANS_CONV_LOCAL_NEWER = 0x10, - /* 0x20 flag can go here */ - PM_TRANS_CONV_REMOVE_HOLDPKG = 0x40 + PM_TRANS_CONV_LOCAL_NEWER = 0x10 } pmtransconv_t; /* Transaction Progress */ @@ -524,7 +517,6 @@ enum _pmerrno_t { PM_ERR_INTERNAL_ERROR, PM_ERR_DB_SYNC, PM_ERR_RETRIEVE, - PM_ERR_PKG_HOLD, PM_ERR_INVALID_REGEX, /* External library errors */ PM_ERR_LIBARCHIVE, diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c index 05caf8e..5b87950 100644 --- a/lib/libalpm/error.c +++ b/lib/libalpm/error.c @@ -143,9 +143,6 @@ const char SYMEXPORT *alpm_strerror(int err) return _("user aborted the operation"); case PM_ERR_INTERNAL_ERROR: return _("internal error"); - case PM_ERR_PKG_HOLD: - /* TODO wow this is not descriptive at all... what does this mean? */ - return _("not confirmed"); case PM_ERR_INVALID_REGEX: return _("invalid regular expression"); /* Errors from external libraries- our own wrapper error */ diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index af1cc78..fbfe7bf 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -92,7 +92,6 @@ void _alpm_handle_free(pmhandle_t *handle) FREELIST(handle->noupgrade); FREELIST(handle->noextract); FREELIST(handle->ignorepkg); - FREELIST(handle->holdpkg); FREELIST(handle->ignoregrp); FREE(handle); } @@ -205,15 +204,6 @@ alpm_list_t SYMEXPORT *alpm_option_get_ignorepkgs() return handle->ignorepkg; } -alpm_list_t SYMEXPORT *alpm_option_get_holdpkgs() -{ - if (handle == NULL) { - pm_errno = PM_ERR_HANDLE_NULL; - return NULL; - } - return handle->holdpkg; -} - alpm_list_t SYMEXPORT *alpm_option_get_ignoregrps() { if (handle == NULL) { @@ -516,28 +506,6 @@ int SYMEXPORT alpm_option_remove_ignorepkg(const char *pkg) return(0); } -void SYMEXPORT alpm_option_add_holdpkg(const char *pkg) -{ - handle->holdpkg = alpm_list_add(handle->holdpkg, strdup(pkg)); -} - -void SYMEXPORT alpm_option_set_holdpkgs(alpm_list_t *holdpkgs) -{ - if(handle->holdpkg) FREELIST(handle->holdpkg); - if(holdpkgs) handle->holdpkg = holdpkgs; -} - -int SYMEXPORT alpm_option_remove_holdpkg(const char *pkg) -{ - char *vdata = NULL; - handle->holdpkg = alpm_list_remove_str(handle->holdpkg, pkg, &vdata); - if(vdata != NULL) { - FREE(vdata); - return(1); - } - return(0); -} - void SYMEXPORT alpm_option_add_ignoregrp(const char *grp) { handle->ignoregrp = alpm_list_add(handle->ignoregrp, strdup(grp)); diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index bec0a6f..ad7666d 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -52,7 +52,6 @@ typedef struct _pmhandle_t { alpm_list_t *noupgrade; /* List of packages NOT to be upgraded */ alpm_list_t *noextract; /* List of files NOT to extract */ alpm_list_t *ignorepkg; /* List of packages to ignore */ - alpm_list_t *holdpkg; /* List of packages which 'hold' pacman */ alpm_list_t *ignoregrp; /* List of groups to ignore */ /* options */ diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 864fafa..b7f04a3 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -65,16 +65,6 @@ int _alpm_remove_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name) RET_ERR(PM_ERR_PKG_NOT_FOUND, -1); } - /* ignore holdpkgs on upgrade */ - if((trans == handle->trans) - && alpm_list_find_str(handle->holdpkg, info->name)) { - int resp = 0; - QUESTION(trans, PM_TRANS_CONV_REMOVE_HOLDPKG, info, NULL, NULL, &resp); - if(!resp) { - RET_ERR(PM_ERR_PKG_HOLD, -1); - } - } - _alpm_log(PM_LOG_DEBUG, "adding %s in the targets list\n", info->name); trans->packages = alpm_list_add(trans->packages, _alpm_pkg_dup(info)); diff --git a/pactest/tests/remove030.py b/pactest/tests/remove030.py index 9e2b9da..e975a4b 100644 --- a/pactest/tests/remove030.py +++ b/pactest/tests/remove030.py @@ -7,7 +7,5 @@ self.option["HoldPkg"] = ["dummy"] self.args = "-R %s" % p1.name -self.addrule("PACMAN_RETCODE=0") -self.addrule("!PKG_EXIST=dummy") -self.addrule("!FILE_EXIST=etc/dummy.conf") -self.addrule("!FILE_PACSAVE=etc/dummy.conf") +self.addrule("PACMAN_RETCODE=1") +self.addrule("PKG_EXIST=dummy") diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 3c98d39..e5404d5 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -260,10 +260,6 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, alpm_pkg_get_name(data1)); } break; - case PM_TRANS_CONV_REMOVE_HOLDPKG: - *response = yesno(_(":: %s is designated as a HoldPkg. Remove anyway?"), - alpm_pkg_get_name(data1)); - break; case PM_TRANS_CONV_REPLACE_PKG: *response = yesno(_(":: Replace %s with %s/%s?"), alpm_pkg_get_name(data1), diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 48c927b..40746e5 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -47,6 +47,7 @@ config_t *config_new(void) newconfig->rootdir = NULL; newconfig->dbpath = NULL; newconfig->logfile = NULL; + newconfig->holdpkg = NULL; newconfig->syncfirst = NULL; return(newconfig); @@ -58,6 +59,7 @@ int config_free(config_t *oldconfig) return(-1); } + FREELIST(oldconfig->holdpkg); FREELIST(oldconfig->syncfirst); free(oldconfig->configfile); free(oldconfig->rootdir); diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 8ea6662..466d983 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -69,6 +69,7 @@ typedef struct __config_t { * downloaded of the total download list */ unsigned short totaldownload; unsigned short cleanmethod; /* select -Sc behavior */ + alpm_list_t *holdpkg; alpm_list_t *syncfirst; } config_t; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 83e713a..92feaf7 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -524,6 +524,11 @@ static int parseargs(int argc, char *argv[]) } /* helper for being used with setrepeatingoption */ +static void option_add_holdpkg(const char *name) { + config->holdpkg = alpm_list_add(config->holdpkg, strdup(name)); +} + +/* helper for being used with setrepeatingoption */ static void option_add_syncfirst(const char *name) { config->syncfirst = alpm_list_add(config->syncfirst, strdup(name)); } @@ -675,7 +680,7 @@ static int _parseconfig(const char *file, const char *givensection, } else if(strcmp(key, "IgnoreGroup") == 0) { setrepeatingoption(ptr, "IgnoreGroup", alpm_option_add_ignoregrp); } else if(strcmp(key, "HoldPkg") == 0) { - setrepeatingoption(ptr, "HoldPkg", alpm_option_add_holdpkg); + setrepeatingoption(ptr, "HoldPkg", option_add_holdpkg); } else if(strcmp(key, "SyncFirst") == 0) { setrepeatingoption(ptr, "SyncFirst", option_add_syncfirst); } else if(strcmp(key, "DBPath") == 0) { diff --git a/src/pacman/remove.c b/src/pacman/remove.c index b70f703..841a08b 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -121,6 +121,21 @@ int pacman_remove(alpm_list_t *targets) goto cleanup; } + /* Search for holdpkg in target list */ + int holdpkg = 0; + for(i = alpm_trans_get_pkgs(); i; i = alpm_list_next(i)) { + pmpkg_t *pkg = alpm_list_getdata(i); + if(alpm_list_find_str(config->holdpkg, alpm_pkg_get_name(pkg))) { + pm_printf(PM_LOG_WARNING, _("%s is designated as a HoldPkg.\n"), + alpm_pkg_get_name(pkg)); + holdpkg = 1; + } + } + if(holdpkg && (noyes(_("HoldPkg was found in target list. Do you want to continue?")) == 0)) { + retval = 1; + goto cleanup; + } + /* Warn user in case of dangerous operation */ if(config->flags & PM_TRANS_FLAG_RECURSE || config->flags & PM_TRANS_FLAG_CASCADE) { -- 1.6.0

2 1