- Pacman-dev - lists.archlinux.org

[pacman-dev] Valgrind updated, blog article plug
by Dan McGee 21 Nov '07

21 Nov '07

I rebuilt valgrind tonight against glibc 2.7, so you may see improved performance using this tool with your pacman debugging and memleak-finding expeditions. I'm mainly letting you all know this because Xavier asked me to write up something on how I use valgrind with pacman. I threw up a short little article on my blog (http://toofishes.net/blog/) to help people get started, the actual article is here: http://toofishes.net/blog/using-valgrind-c-programming/ If you guys have any questions in the future about how I do stuff, whether its coding, algorithms, tools I use, etc. *please* feel free to ask and I will try to answer, either privately or publicly. -Dan P.S. I'm already number 5 on Google (OK, I had to cheat a bit with the search terms). :) http://www.google.com/search?source=ig&hl=en&rlz=&q=valgrind+c

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.0-612-g83fa6aa
by Dan McGee 21 Nov '07

21 Nov '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 discards c419277dd2633b19a2a989f5b2a11cd9b4f4375b (commit) via 83fa6aa2896c0c940e8bf5b7499abc7ef955e658 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (c419277dd2633b19a2a989f5b2a11cd9b4f4375b) \ N -- N -- N (83fa6aa2896c0c940e8bf5b7499abc7ef955e658) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 83fa6aa2896c0c940e8bf5b7499abc7ef955e658 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Aug 25 00:10:40 2007 +0200 Remove duplicated get_upgrades function, use sysupgrade instead. The alpm_get_upgrades was exactly the same as find_replacements + _alpm_sync_sysupgrade, except that it automatically made the eventual replacements, without asking the user : Replace %s with %s/%s? [Y/n] The replace question, asked in find_replacements. can now be skipped by using a NULL trans argument, so that we get the same behavior as with alpm_get_upgrades. So alpm_db_get_upgrades() can now be replaced by alpm_sync_sysupgrade(db_local, syncdbs). Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.0-612-gc419277
by Dan McGee 21 Nov '07

21 Nov '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 c419277dd2633b19a2a989f5b2a11cd9b4f4375b (commit) from 3e9c590480d7ec8fe576cf0a2216e1d3cb61db77 (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 c419277dd2633b19a2a989f5b2a11cd9b4f4375b Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Aug 25 00:10:40 2007 +0200 Remove duplicated get_upgrades function, use sysupgrade instead. The alpm_get_upgrades was exactly the same as find_replacements + _alpm_sync_sysupgrade, except that it automatically made the eventual replacements, without asking the user : Replace %s with %s/%s? [Y/n] The replace question, asked in find_replacements. can now be skipped by using a NULL trans argument, so that we get the same behavior as with alpm_get_upgrades. So alpm_db_get_upgrades() can now be replaced by alpm_sync_sysupgrade(db_local, syncdbs). Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/alpm.h | 4 +- lib/libalpm/db.c | 144 --------------------------------- lib/libalpm/sync.c | 221 ++++++++++++++++++++++++++++++--------------------- lib/libalpm/sync.h | 4 +- lib/libalpm/trans.c | 3 +- src/pacman/query.c | 8 ++- 6 files changed, 142 insertions(+), 242 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.0-611-g3e9c590
by Dan McGee 21 Nov '07

21 Nov '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 3e9c590480d7ec8fe576cf0a2216e1d3cb61db77 (commit) via 5f2899622070496eb7e918c9089c6a6327bacb41 (commit) via 4696ad6cad9c659728e9e061689728fc0417ad73 (commit) via 967a78f5e476030c2d13104a7dadc5ce4daf5882 (commit) via aa942a126bb7c229f7b94e5e0ab8de5241f77580 (commit) via 4576000c39ea350fc563163c4deb2e2e4031e386 (commit) via 84ebf8231985ff285f7995cd7ecaceb750a3c78b (commit) via 23b4e0270b1a1881b2daf362a398a3bdc20fab43 (commit) from 2aa7e69da91c1d7a18473cf05df98c92bd1dc747 (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 3e9c590480d7ec8fe576cf0a2216e1d3cb61db77 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 20 19:06:37 2007 -0600 doc: use source highlighter on PKGBUILD guide, update wrong example text Note that if you are building manpages with asciidoc now, you must also have source-highlight installed for it to correctly generate everything. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5f2899622070496eb7e918c9089c6a6327bacb41 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 20 18:58:09 2007 -0600 Turn HACKING into an asciidoc document Add some hints so we can use asciidoc on the HACKING document. It is still readable as text, but a simple 'asciidoc HACKING' command will give you a nice pretty guide now. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4696ad6cad9c659728e9e061689728fc0417ad73 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Nov 20 09:11:40 2007 +0100 New alpm_list_join function This O(1) function joins 2 lists. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 967a78f5e476030c2d13104a7dadc5ce4daf5882 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Mon Nov 19 18:23:04 2007 +0100 Update PKGBUILD manpage with versioned conflicts. As the b96922679e4ed14aa687bf194b766d82a1d10577 commit showed with two pactests (which were renamed to depconflict110/111), versioned conflicts are now possible. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit aa942a126bb7c229f7b94e5e0ab8de5241f77580 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 20 11:01:56 2007 -0600 Add missing header includes for setlocale Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4576000c39ea350fc563163c4deb2e2e4031e386 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Nov 19 15:46:02 2007 -0600 Spruce up HACKING a bit Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 84ebf8231985ff285f7995cd7ecaceb750a3c78b Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri Nov 16 22:37:57 2007 +0100 Versioned provisions. This patch introduces versioned provisions in "provision 1.0-1" format. _alpm_db_whatprovides was modified accordingly (added sync500.py), alpm_depcmp was modified accordingly (add043.py passes now; added add044.py and add045.py). Notes: alpm_db_search now uses the whole versioned %PROVIDES% string in its search. debug logging was simplified in alpm_depcmp. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> [Xavier: fixed a few typos, duplicate const strings with strdup before modifying them, put some debugging back in alpm_depcmp, minor code cleanups (var/function renaming), added a note in PKGBUILD man page.] Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> [Dan: made strcmp checks clearer, added a comment] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 23b4e0270b1a1881b2daf362a398a3bdc20fab43 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 18 16:49:02 2007 -0600 Fix sh and scriptlet interaction dash doesn't pass positional parameters to sourced scripts, causing install scripts to fail. Instead of sourcing the script, make it executable and call it directly which allows positional parameters to be passed correctly. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: HACKING | 107 ++++++++++++++++++++++---------- doc/PKGBUILD.5.txt | 13 +++-- lib/libalpm/alpm_list.c | 33 ++++++++++ lib/libalpm/alpm_list.h | 1 + lib/libalpm/be_files.c | 1 + lib/libalpm/db.c | 21 ++++++- lib/libalpm/db.h | 1 + lib/libalpm/deps.c | 51 +++++++++------- lib/libalpm/package.c | 1 + lib/libalpm/sync.c | 4 +- lib/libalpm/trans.c | 15 +++- pactest/tests/{add043.py => add044.py} | 8 +- pactest/tests/{add043.py => add045.py} | 4 +- pactest/tests/sync500.py | 10 +++ 14 files changed, 197 insertions(+), 73 deletions(-) copy pactest/tests/{add043.py => add044.py} (57%) copy pactest/tests/{add043.py => add045.py} (75%) create mode 100644 pactest/tests/sync500.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] There is a "problem" with list->prev tail pointer
by Nagy Gabor 20 Nov '07

20 Nov '07

Look at the following code-part: for(i = list; i; i = i->next) { alpm_list_foo(i); /*WARNING!!*/ } Comment: So a node in a list (i in the example) is NOT a valid alpm_list_t: You can do alpm_list_getdata for example, but not alpm_list_add. This is very confusing to me. We should somehow differeniate between alpm_list_t and alpm_list_node_t types, so at least force the compiler to give a warning message. Bye ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

2 1

[pacman-dev] [PATCH] _alpm_checkconflicts split
by Nagy Gabor 20 Nov '07

20 Nov '07

Patch attached Bye PS: Xavier, this patch was created mainly for your sync repo and your shining[;-)] testdb. ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

2 2

[pacman-dev] [PATCH] Versioned provisions
by Nagy Gabor 20 Nov '07

20 Nov '07

Hi! Patch attached. Bye ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

5 44

[pacman-dev] -Sp is broken?
by Nagy Gabor 19 Nov '07

19 Nov '07

-Sp simply seems to be broken. If I do pacman -Sp evince, I get the following error: 'error: evince': transaction not initialized error: failed to release transaction (transaction not initialized) Bye, ngaba ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

5 12

[pacman-dev] [PATCH 4/5] Versioned provisions
by Nagy Gabor 19 Nov '07

19 Nov '07

This patch introduces versioned provisions in "provision 1.0-1" format. _alpm_db_whatprovides was modified accordingly (added sync500.py) alpm_depcmp was modified accordingly (add043.py passes now; added add044.py and add045.py) Note: alpm_db_search now uses the whole versioned %PROVIDES% string in its search Note: debug logging was simplified in alpm_depcmp Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> [Xavier: fixed a few typos, duplicate const strings with strdup before modifying them, put some debugging back in alpm_depcmp, minor code cleanups (var/function renaming), added a note in PKGBUILD man page.] Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- doc/PKGBUILD.5.txt | 2 + lib/libalpm/db.c | 21 +++++++++++++++++- lib/libalpm/db.h | 1 + lib/libalpm/deps.c | 54 +++++++++++++++++++++++++-------------------- lib/libalpm/sync.c | 4 +- pactest/tests/add044.py | 15 ++++++++++++ pactest/tests/add045.py | 15 ++++++++++++ pactest/tests/sync500.py | 10 ++++++++ 8 files changed, 95 insertions(+), 27 deletions(-) create mode 100644 pactest/tests/add044.py create mode 100644 pactest/tests/add045.py create mode 100644 pactest/tests/sync500.py diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 6950041..0d3ff3a 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -133,6 +133,8 @@ Options and Directives a package to provide dependencies other than its own package name. For example, the dcron package can provide 'cron', which allows packages to depend on 'cron' rather than 'dcron OR fcron'. + Versioned provisions are also possible. For example, dcron can provide + 'cron 2.0' to satisfy the 'cron>=2.0' dependency of other packages. *replaces (array)*:: An array of packages that this package should replace, and can be used diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index af58387..fd5786e 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -777,6 +777,25 @@ pmdb_t *_alpm_db_register_sync(const char *treename) return(db); } +/* helper function for alpm_list_find and _alpm_db_whatprovides + * + * @return "provision.name" == needle (as string) + */ +int _alpm_prov_cmp(const void *provision, const void *needle) +{ + char *tmpptr; + char *provname = strdup(provision); + int retval = 0; + tmpptr = strchr(provname, ' '); + + if(tmpptr != NULL) { /* provision-version */ + *tmpptr='\0'; + } + retval = strcmp(provname, needle); + free(provname); + return(retval); +} + /* return a alpm_list_t of packages in "db" that provide "package" */ alpm_list_t *_alpm_db_whatprovides(pmdb_t *db, const char *package) @@ -793,7 +812,7 @@ alpm_list_t *_alpm_db_whatprovides(pmdb_t *db, const char *package) for(lp = _alpm_db_get_pkgcache(db); lp; lp = lp->next) { pmpkg_t *info = lp->data; - if(alpm_list_find_str(alpm_pkg_get_provides(info), package)) { + if(alpm_list_find(alpm_pkg_get_provides(info), (const void *)package, _alpm_prov_cmp)) { pkgs = alpm_list_add(pkgs, info); } } diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 5d7173b..c34dfeb 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -57,6 +57,7 @@ pmdb_t *_alpm_db_register_local(void); pmdb_t *_alpm_db_register_sync(const char *treename); /* Provision */ +int _alpm_prov_cmp(const void *provision, const void *needle); alpm_list_t *_alpm_db_whatprovides(pmdb_t *db, const char *package); /* be.c, backend specific calls */ diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 679981c..9232984 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -373,10 +373,12 @@ alpm_list_t *_alpm_checkdeps(pmdb_t *db, pmtranstype_t op, /* else if still not found... */ if(!found) { + char *depstring = alpm_dep_get_string(depend); _alpm_log(PM_LOG_DEBUG, "missing dependency '%s' for package '%s'\n", - (char*)j->data, alpm_pkg_get_name(tp)); + depstring, alpm_pkg_get_name(tp)); + free(depstring); miss = _alpm_depmiss_new(alpm_pkg_get_name(tp), PM_DEP_TYPE_DEPEND, depend->mod, - depend->name, depend->version); + depend->name, depend->version); if(!_alpm_depmiss_isin(miss, baddeps)) { baddeps = alpm_list_add(baddeps, miss); } else { @@ -419,8 +421,10 @@ alpm_list_t *_alpm_checkdeps(pmdb_t *db, pmtranstype_t op, for(l = _alpm_db_get_pkgcache(db); l; l = l->next) { pmpkg_t *pkg = l->data; if(alpm_depcmp(pkg, depend) && !_alpm_pkg_find(alpm_pkg_get_name(pkg), packages)) { + char *depstring = alpm_dep_get_string(depend); _alpm_log(PM_LOG_DEBUG, "checkdeps: dependency '%s' satisfied by installed package '%s'\n", - (char*)k->data, alpm_pkg_get_name(pkg)); + depstring, alpm_pkg_get_name(pkg)); + free(depstring); satisfied = 1; break; } @@ -469,38 +473,40 @@ static int dep_vercmp(const char *version1, pmdepmod_t mod, int SYMEXPORT alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep) { - int equal = 0; + alpm_list_t *i; ALPM_LOG_FUNC; const char *pkgname = alpm_pkg_get_name(pkg); - const char *pkgversion = alpm_pkg_get_version(pkg); + const char *pkgver = alpm_pkg_get_version(pkg); + int satisfy = 0; - if(strcmp(pkgname, dep->name) == 0 - || alpm_list_find_str(alpm_pkg_get_provides(pkg), dep->name)) { + /* check (pkg->name, pkg->version) */ + satisfy = (!strcmp(pkgname, dep->name) + && dep_vercmp(pkgver, dep->mod, dep->version)); - equal = dep_vercmp(pkgversion, dep->mod, dep->version); + /* check provisions, format : "name version" */ + for(i = alpm_pkg_get_provides(pkg); i && !satisfy; i = i->next) { + char *provname = strdup(i->data); + char *provver = strchr(provname, ' '); - char *mod = "~="; - switch(dep->mod) { - case PM_DEP_MOD_EQ: mod = "=="; break; - case PM_DEP_MOD_GE: mod = ">="; break; - case PM_DEP_MOD_LE: mod = "<="; break; - default: break; - } - - if(strlen(dep->version) > 0) { - _alpm_log(PM_LOG_DEBUG, "depcmp: %s-%s %s %s-%s => %s\n", - pkgname, pkgversion, - mod, dep->name, dep->version, (equal ? "match" : "no match")); + if(provver == NULL) { /* no provision version */ + satisfy = (dep->mod == PM_DEP_MOD_ANY + && !strcmp(provname, dep->name)); } else { - _alpm_log(PM_LOG_DEBUG, "depcmp: %s-%s %s %s => %s\n", - pkgname, pkgversion, - mod, dep->name, (equal ? "match" : "no match")); + *provver = '\0'; + provver += 1; + satisfy = (!strcmp(provname, dep->name) + && dep_vercmp(provver, dep->mod, dep->version)); } + free(provname); } - return(equal); + char *depstring = alpm_dep_get_string(dep); + _alpm_log(PM_LOG_DEBUG, "alpm_depcmp %s-%s %s : %smatch\n", + pkgname, pkgver, depstring, satisfy ? "" : "no "); + free(depstring); + return(satisfy); } pmdepend_t SYMEXPORT *alpm_splitdep(const char *depstring) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 6024b6b..1fd8700 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -499,8 +499,8 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync } pmpkg_t *local = _alpm_db_get_pkgfromcache(db_local, miss->depend.name); /* check if this package provides the package it's conflicting with */ - if(alpm_list_find_str(alpm_pkg_get_provides(sync->pkg), - miss->depend.name)) { + if(alpm_list_find(alpm_pkg_get_provides(sync->pkg), + miss->depend.name, _alpm_prov_cmp)) { /* treat like a replaces item so requiredby fields are * inherited properly. */ _alpm_log(PM_LOG_DEBUG, "package '%s' provides its own conflict\n", diff --git a/pactest/tests/add044.py b/pactest/tests/add044.py new file mode 100644 index 0000000..cbc82e9 --- /dev/null +++ b/pactest/tests/add044.py @@ -0,0 +1,15 @@ +self.description = "provision>=1.0-2 dependency (2)" + +p = pmpkg("pkg1", "1.0-2") +p.depends = ["provision>=1.0-2"] +self.addpkg(p) + +lp = pmpkg("pkg2", "1.0-2") +lp.provides = ["provision 1.0-2"] +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/add045.py b/pactest/tests/add045.py new file mode 100644 index 0000000..b53e090 --- /dev/null +++ b/pactest/tests/add045.py @@ -0,0 +1,15 @@ +self.description = "provision>=1.0-2 dependency (3)" + +p = pmpkg("pkg1", "1.0-2") +p.depends = ["provision>=1.0-2"] +self.addpkg(p) + +lp = pmpkg("pkg2", "1.0-2") +lp.provides = ["provision 1.0-1"] +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") diff --git a/pactest/tests/sync500.py b/pactest/tests/sync500.py new file mode 100644 index 0000000..36364c1 --- /dev/null +++ b/pactest/tests/sync500.py @@ -0,0 +1,10 @@ +self.description = "-S provision" + +sp = pmpkg("pkg1") +sp.provides = ["provision 1.0-1"] +self.addpkg2db("sync", sp) + +self.args = "-S provision" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") -- 1.5.3.5

4 7

[pacman-dev] [PATCH]: makeworld: gettext support
by Giovanni Scafora 19 Nov '07

19 Nov '07

Signed-off-by: Giovanni Scafora <linuxmania(a)gmail.com> --- scripts/makeworld.sh.in | 53 +++++++++++++++++++++++++--------------------- 1 files changed, 29 insertions(+), 24 deletions(-) diff --git a/scripts/makeworld.sh.in b/scripts/makeworld.sh.in index 728e00e..49b758c 100644 --- a/scripts/makeworld.sh.in +++ b/scripts/makeworld.sh.in @@ -21,45 +21,50 @@ # USA. # +# gettext initialization +export TEXTDOMAIN='pacman' +export TEXTDOMAINDIR='@localedir@' + myver="@PACKAGE_VERSION@" +BUG_REPORT_EMAIL='@PACKAGE_BUGREPORT@' toplevel=$(pwd) usage() { printf "makeworld (pacman) %s\n" "$myver" - echo "usage: $0 [options] <destdir> <category> [category] ..." - echo "options:" - echo " -b, --builddeps Build missing dependencies from source" - echo " -B, --noccache Do not use ccache during build" - echo " -c, --clean Clean up work files after build" - echo " -C, --cleancache Clean up source files from the cache" - echo " -d, --nodeps Skip all dependency checks" - echo " -e, --noextract Do not extract source files (use existing src/ dir)" - echo " -f, --force Overwrite existing packages" - echo " -i, --install Install package after successful build" - echo " -m, --nocolor Disable colorized output messages" - echo " -h, --help This help" - echo " -o, --nobuild Download and extract files only" - echo " -r, --rmdeps Remove installed dependencies after a successful build" - echo " -s, --syncdeps Install missing dependencies with pacman" - echo " -S, --usesudo Use sudo when running pacman commands" + echo "$(gettext "Usage: %s [options] <destdir> <category> [category] ...")" "$0" + echo "$(gettext "Options:")" + echo "$(gettext " -b, --builddeps Build missing dependencies from source")" + echo "$(gettext " -B, --noccache Do not use ccache during build")" + echo "$(gettext " -c, --clean Clean up work files after build")" + echo "$(gettext " -C, --cleancache Clean up source files from the cache")" + echo "$(gettext " -d, --nodeps Skip all dependency checks")" + echo "$(gettext " -e, --noextract Do not extract source files (use existing src/ dir)")" + echo "$(gettext " -f, --force Overwrite existing packages")" + echo "$(gettext " -i, --install Install package after successful build")" + echo "$(gettext " -m, --nocolor Disable colorized output messages")" + echo "$(gettext " -h, --help This help")" + echo "$(gettext " -o, --nobuild Download and extract files only")" + echo "$(gettext " -r, --rmdeps Remove installed dependencies after a successful build")" + echo "$(gettext " -s, --syncdeps Install missing dependencies with pacman")" + echo "$(gettext " -S, --usesudo Use sudo when running pacman commands")" echo - echo "These options can be passed to pacman:" + echo "$(gettext "These options can be passed to pacman:")" echo - echo " --noconfirm Do not ask for confirmation when resolving dependencies" - echo " --noprogressbar Do not show a progress bar when downloading files" + echo "$(gettext " --noconfirm Do not ask for confirmation when resolving dependencies")" + echo "$(gettext " --noprogressbar Do not show a progress bar when downloading files")" echo - echo "Where <category> is one or more directory names under the ABS root" - echo "eg: makeworld -c /packages base lib editors" + echo "$(gettext "Where <category> is one or more directory names under the ABS root")" + echo "$(gettext "eg: makeworld -c /packages base lib editors")" echo - echo "This should be run from the toplevel directory of ABS (usually /var/abs)" + echo "$(gettext "This should be run from the toplevel directory of ABS (usually /var/abs)")" } version() { printf "makeworld (pacman) %s\n" "$myver" - printf "\ + printf "$(gettext "\ Copyright (C) 2002-2007 Judd Vinet <jvinet(a)zeroflux.org>.\n\n\ This is free software; see the source for copying conditions.\n\ -There is NO WARRANTY, to the extent permitted by law.\n" +There is NO WARRANTY, to the extent permitted by law.\n")" } MAKEPKG_OPTS= -- 1.5.3.5 -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

2 3