- Pacman-dev - lists.archlinux.org

[pacman-dev] Two missing BUILDSCRIPT variables from makepkg
by Mark Constable 20 Feb '08

20 Feb '08

FWIW --- /usr/bin/makepkg.orig 2008-02-20 16:15:35.000000000 +1000 +++ /usr/bin/makepkg 2008-02-20 16:18:03.000000000 +1000 @@ -934,8 +934,8 @@ create_srcpackage() { cd "$startdir" msg "$(gettext "Creating source package...")" - local comp_files="PKGBUILD" - msg2 "$(gettext "Adding %s...")" "PKGBUILD" + local comp_files="$BUILDSCRIPT" + msg2 "$(gettext "Adding %s...")" "$BUILDSCRIPT" if [ "$install" != "" ]; then if [ -f $install ]; then --markc

2 1

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.1.1-53-g7879e4b
by Dan McGee 20 Feb '08

20 Feb '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 7879e4bef7c158814a547d232f0bde8960ee1341 (commit) via 6f3949e3da4325f61ac53d7c8b86a18ff6acb64e (commit) via 2b3a85dc4a1d8855449ae979713fda0b8cbc7580 (commit) via fc9d12bef039f558d9731c7dcb2f441ad5832def (commit) via 5676dbae4de0504a62758046c4974c2522789202 (commit) via 81db1847c92ca54f84a355e012354828898c827f (commit) via 848edb2f3859a258cc16ca96bf1e4d284e255b8d (commit) via b091ccc400d3cabc1a632bd025f9fecc3c2bc8c4 (commit) via 4ac9b2eb068aff3ff4f785e28712bb0fa9e045be (commit) via 355930654693b416725e170ad0cb14d0251626e4 (commit) from 2374c81e55abc0f7252fad7eb53d2b75bb33f750 (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 7879e4bef7c158814a547d232f0bde8960ee1341 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Tue Feb 19 21:57:40 2008 +0100 Lock the database on -Sc operation. This partly fixes FS#9609. Weird things could happen when running -Sc while another instance was already running. The cleancache function could delete packages that were just being downloaded. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 6f3949e3da4325f61ac53d7c8b86a18ff6acb64e Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Tue Feb 19 20:32:48 2008 +0100 Add new sync_trans_init and sync_trans_release. Factorize these two functions to avoid code duplication, especially since they could be used for locking the database during -Sc and -Sy operation too. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 2b3a85dc4a1d8855449ae979713fda0b8cbc7580 Author: Fernando Lagos <fernando(a)zerial.org> Date: Tue Feb 19 17:02:42 2008 +0100 More small updates to Spanish translation Signed-off-by: Giovanni Scafora <linuxmania(a)gmail.com> commit fc9d12bef039f558d9731c7dcb2f441ad5832def Author: Dan McGee <dan(a)archlinux.org> Date: Tue Feb 19 08:47:05 2008 -0600 When cleaning DBs, only look at directories FS#9609 brought up an interesting issue where a user was prompted to remove db.lck when running a -Sc operation concurrently with an -Syu operation during a long download. Although there are other problems here, this fixes the issue where files other than directories could be considered to be databases. Fix this. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5676dbae4de0504a62758046c4974c2522789202 Author: Mateusz Herych <heniekk(a)gmail.com> Date: Tue Feb 19 08:41:05 2008 -0600 Final updates to Polish translation Good job on the group effort guys, thanks for getting this one complete. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 81db1847c92ca54f84a355e012354828898c827f Author: Vitaly Dolgov <ferhiord(a)gmail.com> Date: Mon Feb 18 19:34:37 2008 +0100 Update pacman Russian translation. Cleaned up by Oleg Finkelshteyn. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 848edb2f3859a258cc16ca96bf1e4d284e255b8d Author: Sergey Tereschenko <serg.partizan(a)gmail.com> Date: Mon Feb 18 19:28:39 2008 +0100 Update libalpm russian translation. Cleaned up by Oleg Finkelshteyn. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit b091ccc400d3cabc1a632bd025f9fecc3c2bc8c4 Author: Allan McRae <mcrae_allan(a)hotmail.com> Date: Mon Feb 18 14:18:47 2008 +1000 Do not warn about up to date package when downloading only Stops the "<pkg> is up to date -- reinstalling" message when using the download only flag. Ref: http://archlinux.org/pipermail/pacman-dev/2008-January/010952.html Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4ac9b2eb068aff3ff4f785e28712bb0fa9e045be Author: Владимир Байраковский <4rayven(a)gmail.com> Date: Sun Feb 17 23:58:22 2008 -0600 Updates to Russian translation Note that it still is not complete. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 355930654693b416725e170ad0cb14d0251626e4 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Feb 17 21:15:06 2008 -0600 scripts: allow usage when gettext is not installed Address the issue of our scripts not working so great when gettext is not available. This has come up in multiple bug reports, and is relatively easy to address by adding a simple check and a stub function if gettext was not found that simply echos the original message. Addresses concerns from FS#9214 and FS#9607. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/pl.po | 333 +++++++------- lib/libalpm/po/ru.po | 346 +++++++-------- lib/libalpm/sync.c | 6 +- po/es.po | 4 +- po/pl.po | 20 +- po/ru.po | 990 +++++++++++++++++++++-------------------- scripts/gensync.sh.in | 7 + scripts/makepkg.sh.in | 9 + scripts/pacman-optimize.sh.in | 9 + scripts/repo-add.sh.in | 7 + scripts/repo-remove.sh.in | 7 + scripts/updatesync.sh.in | 7 + src/pacman/sync.c | 77 +++-- 13 files changed, 950 insertions(+), 872 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] How can I upload my translation?
by gan lu 20 Feb '08

20 Feb '08

I have finished my Chinese Simplified translation of pacman.pot, but how can I upload it? Thanks.

5 12

[pacman-dev] FS#9424 : storing pid in db.lck
by Xavier 19 Feb '08

19 Feb '08

Quote from the feature request : > Pacman would be able to handle automatically lock file removal without user > interaction if db.lck was dead, but it would still be locked if it was > alive. That looks interesting, and there is also a patch attached, that I am repasting here: diff -Naur pacman-3.1.1/lib/libalpm/alpm.h pacman-3.1.1.bak/lib/libalpm/alpm.h --- pacman-3.1.1/lib/libalpm/alpm.h 2008-01-20 20:14:45.000000000 +0100 +++ pacman-3.1.1.bak/lib/libalpm/alpm.h 2008-02-03 03:58:03.000000000 +0100 @@ -428,6 +428,7 @@ PM_ERR_HANDLE_NULL, PM_ERR_HANDLE_NOT_NULL, PM_ERR_HANDLE_LOCK, + PM_ERR_INSTANCE_RUNNING, /* Databases */ PM_ERR_DB_OPEN, PM_ERR_DB_CREATE, diff -Naur pacman-3.1.1/lib/libalpm/error.c pacman-3.1.1.bak/lib/libalpm/error.c --- pacman-3.1.1/lib/libalpm/error.c 2008-01-20 20:14:45.000000000 +0100 +++ pacman-3.1.1.bak/lib/libalpm/error.c 2008-02-03 03:58:03.000000000 +0100 @@ -56,6 +56,8 @@ return _("library already initialized"); case PM_ERR_HANDLE_LOCK: return _("unable to lock database"); + case PM_ERR_INSTANCE_RUNNING: + return _("another instance is running"); /* Databases */ case PM_ERR_DB_OPEN: return _("could not open database"); diff -Naur pacman-3.1.1/lib/libalpm/trans.c pacman-3.1.1.bak/lib/libalpm/trans.c --- pacman-3.1.1/lib/libalpm/trans.c 2008-01-20 20:17:05.000000000 +0100 +++ pacman-3.1.1.bak/lib/libalpm/trans.c 2008-02-03 03:58:03.000000000 +0100 @@ -75,6 +75,8 @@ handle->lckfd = _alpm_lckmk(); if(handle->lckfd == -1) { RET_ERR(PM_ERR_HANDLE_LOCK, -1); + } else if(handle->lckfd == -2) { + RET_ERR(PM_ERR_INSTANCE_RUNNING, -1); } handle->trans = _alpm_trans_new(); diff -Naur pacman-3.1.1/lib/libalpm/util.c pacman-3.1.1.bak/lib/libalpm/util.c --- pacman-3.1.1/lib/libalpm/util.c 2008-01-20 20:17:05.000000000 +0100 +++ pacman-3.1.1.bak/lib/libalpm/util.c 2008-02-03 17:49:53.000000000 +0100 @@ -330,30 +330,64 @@ return newstr; } - /* Create a lock file */ int _alpm_lckmk() { - int fd, count = 0; + /* + * pid: string representing pacman pid + * tmpfile: string containing the temporary file + * sizeofpid: integer that stores sizeof(pid) + */ + char pid[7], tmpfile[19]="/tmp/pacman-lock-", existingpid[7], runningprocess[15]="/proc/"; + int fd, count, sizeofpid; char *dir, *ptr; - const char *file = alpm_option_get_lockfile(); - + struct stat st; + const char *lockfile = alpm_option_get_lockfile(); + /* create the dir of the lockfile first */ - dir = strdup(file); + dir = strdup(lockfile); ptr = strrchr(dir, '/'); if(ptr) { *ptr = '\0'; } _alpm_makepath(dir); + + // fill with zeroes + for (count=0; count<sizeof(existingpid); count++) { + existingpid[count]='\0'; + } - while((fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000)) == -1 && errno == EACCES) { + /* check if there is another lock, and if so, check if its associated process is running */ + if ((fd = open(lockfile, O_RDONLY , 0000)) != -1) { + read(fd, existingpid, sizeof(existingpid)); + int n = read(fd, existingpid, sizeof(existingpid)); + close(fd); + existingpid[n] = '\0'; + strcat(runningprocess,existingpid); + if (stat(runningprocess, &st) != -1 && S_ISDIR(st.st_mode)) { + return -2; + } + } + if (unlink(lockfile) == -1 && errno != ENOENT) { + return -1; + } + + sizeofpid = sprintf(pid, "%d", getpid()); + strcat(tmpfile,pid); + + count=0; + while((fd = open(tmpfile, O_WRONLY | O_CREAT | O_EXCL, 0444)) == -1 && errno == EACCES) { if(++count < 1) { sleep(1); - } else { + } else { return(-1); } } + write(fd, pid, sizeofpid); + + symlink(tmpfile, lockfile); + FREE(dir); return(fd > 0 ? fd : -1); @@ -362,13 +396,23 @@ /* Remove a lock file */ int _alpm_lckrm() { - const char *file = alpm_option_get_lockfile(); - if(unlink(file) == -1 && errno != ENOENT) { + char pid[7], tmpfile[19]="/tmp/pacman-lock-"; + const char *lockfile = alpm_option_get_lockfile(); + int unlinkstatus=0; + + sprintf(pid, "%d", getpid()); + strcat(tmpfile,pid); + + if(unlink(tmpfile) == -1 && errno != ENOENT) { + unlinkstatus=-1; + } + if(unlink(lockfile) == -1 && errno != ENOENT) { return(-1); } - return(0); + return (unlinkstatus); } + /* Compression functions */ int _alpm_unpack(const char *archive, const char *prefix, const char *fn)

2 2

[pacman-dev] [translation] spanish update
by Zerial 19 Feb '08

19 Feb '08

Hi guys, this is the update for spanish translation -- Linux User #382319 http://blog.zerial.org

2 4

[pacman-dev] [PATCH] Rework of check-for-new-pacman-version
by Chantry Xavier 19 Feb '08

19 Feb '08

This patch is primarily a fix for FS#9228. The -Sy operation was moved to its own transaction, which allows us to do the following steps : 1) refresh the database if asked 2) check if a new pacman version if available if yes, initialize a "-S pacman" transaction. If no, initialize the original -S or -Su transaction. Note that the newversion check was extended to the "-S target" operation, which is helpful in case of syncdb syntax change (see versioned provisions for example) Original-work-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- src/pacman/sync.c | 129 +++++++++++++++++++++++++++-------------------------- 1 files changed, 66 insertions(+), 63 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 27218d6..2dd03f3 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -202,6 +202,17 @@ static int sync_synctree(int level, alpm_list_t *syncs) alpm_list_t *i; int success = 0, ret; + if(alpm_trans_init(PM_TRANS_TYPE_SYNC, 0, cb_trans_evt, + cb_trans_conv, cb_trans_progress) == -1) { + fprintf(stderr, _("error: failed to init transaction (%s)\n"), + alpm_strerrorlast()); + if(pm_errno == PM_ERR_HANDLE_LOCK) { + printf(_(" if you're sure a package manager is not already\n" + " running, you can remove %s.\n"), alpm_option_get_lockfile()); + } + return(0); + } + for(i = syncs; i; i = alpm_list_next(i)) { pmdb_t *db = alpm_list_getdata(i); @@ -229,10 +240,18 @@ static int sync_synctree(int level, alpm_list_t *syncs) } } + if(alpm_trans_release() == -1) { + fprintf(stderr, _("error: failed to release transaction (%s)\n"), + alpm_strerrorlast()); + return(0); + } /* We should always succeed if at least one DB was upgraded - we may possibly * fail later with unresolved deps, but that should be rare, and would be * expected */ + if(!success) { + fprintf(stderr, _("error: failed to synchronize any databases\n")); + } return(success > 0); } @@ -469,7 +488,22 @@ static int sync_list(alpm_list_t *syncs, alpm_list_t *targets) return(0); } -static int sync_trans(alpm_list_t *targets, int sync_only) +static int pacman_isoutofdate(void) +{ + pmpkg_t *pacman = alpm_db_get_pkg(alpm_option_get_localdb(), "pacman"); + if(pacman == NULL) { + printf(_("Warning: no installed pacman package was found\n")); + return(0); + } + + if(alpm_sync_newversion(pacman, alpm_option_get_syncdbs())) { + return(1); + } else { + return(0); + } +} + +static int sync_trans(alpm_list_t *targets) { int retval = 0; alpm_list_t *data = NULL; @@ -487,23 +521,8 @@ static int sync_trans(alpm_list_t *targets, int sync_only) return(1); } - if(config->op_s_sync) { - /* grab a fresh package list */ - printf(_(":: Synchronizing package databases...\n")); - alpm_logaction("synchronizing package lists\n"); - if(!sync_synctree(config->op_s_sync, sync_dbs)) { - fprintf(stderr, _("error: failed to synchronize any databases\n")); - retval = 1; - goto cleanup; - } - if(sync_only) { - goto cleanup; - } - } - if(config->op_s_upgrade) { - alpm_list_t *pkgs, *i; - + /* sysupgrade */ printf(_(":: Starting full system upgrade...\n")); alpm_logaction("starting full system upgrade\n"); if(alpm_trans_sysupgrade() == -1) { @@ -511,46 +530,6 @@ static int sync_trans(alpm_list_t *targets, int sync_only) retval = 1; goto cleanup; } - - if(!(alpm_trans_get_flags() & (PM_TRANS_FLAG_DOWNLOADONLY | PM_TRANS_FLAG_PRINTURIS))) { - /* check if pacman itself is one of the packages to upgrade. - * this can prevent some of the "syntax error" problems users can have - * when sysupgrade'ing with an older version of pacman. - */ - pkgs = alpm_trans_get_pkgs(); - for(i = pkgs; i; i = alpm_list_next(i)) { - pmsyncpkg_t *sync = alpm_list_getdata(i); - pmpkg_t *spkg = alpm_sync_get_pkg(sync); - /* TODO pacman name should probably not be hardcoded. In addition, we - * have problems on an -Syu if pacman has to pull in deps, so recommend - * an '-S pacman' operation */ - if(strcmp("pacman", alpm_pkg_get_name(spkg)) == 0) { - printf("\n"); - printf(_(":: pacman has detected a newer version of itself.\n")); - if(yesno(_(":: Do you want to cancel the current operation\n" - ":: and install the new pacman version now? [Y/n] "))) { - if(alpm_trans_release() == -1) { - fprintf(stderr, _("error: failed to release transaction (%s)\n"), - alpm_strerrorlast()); - retval = 1; - goto cleanup; - } - if(alpm_trans_init(PM_TRANS_TYPE_SYNC, config->flags, - cb_trans_evt, cb_trans_conv, cb_trans_progress) == -1) { - fprintf(stderr, _("error: failed to init transaction (%s)\n"), - alpm_strerrorlast()); - return(1); - } - if(alpm_trans_addtarget("pacman") == -1) { - fprintf(stderr, _("error: pacman: %s\n"), alpm_strerrorlast()); - retval = 1; - goto cleanup; - } - break; - } - } - } - } } else { alpm_list_t *i; @@ -756,7 +735,6 @@ cleanup: int pacman_sync(alpm_list_t *targets) { alpm_list_t *sync_dbs = NULL; - int sync_only = 0; /* clean the cache */ if(config->op_s_clean) { @@ -772,18 +750,43 @@ int pacman_sync(alpm_list_t *targets) return(1); } - if(config->op_s_search || config->group - || config->op_s_info || config->op_q_list) { - sync_only = 1; - } else if(targets == NULL && !(config->op_s_sync || config->op_s_upgrade)) { + if(targets == NULL && !(config->op_s_sync || config->op_s_upgrade)) { /* don't proceed here unless we have an operation that doesn't require * a target list */ pm_printf(PM_LOG_ERROR, _("no targets specified (use -h for help)\n")); return(1); } + if(config->op_s_sync) { + /* grab a fresh package list */ + printf(_(":: Synchronizing package databases...\n")); + alpm_logaction("synchronizing package lists\n"); + if(!sync_synctree(config->op_s_sync, sync_dbs)) { + return(1); + } + config->op_s_sync = 0; + } + if(needs_transaction()) { - if(sync_trans(targets, sync_only) == 1) { + alpm_list_t *targs = alpm_list_strdup(targets); + if(!(config->flags & (PM_TRANS_FLAG_DOWNLOADONLY | PM_TRANS_FLAG_PRINTURIS))) { + /* check for new pacman version */ + if(pacman_isoutofdate()) { + printf("\n"); + printf(_(":: pacman has detected a newer version of itself.\n")); + if(yesno(_(":: Do you want to cancel the current operation\n" + ":: and install the new pacman version now? [Y/n] "))) { + FREELIST(targs); + targs = alpm_list_add(targs, strdup("pacman")); + config->flags = 0; + config->op_s_upgrade = 0; + } + } + } + + int ret = sync_trans(targs); + FREELIST(targs); + if(ret == 1) { return(1); } } -- 1.5.4

4 12

[pacman-dev] [PATCH] Do not warn about up to date package when downloading only
by Allan McRae 18 Feb '08

18 Feb '08

5 5

[pacman-dev] [translation] Russian translation updated
by Владимир Байраковский 18 Feb '08

18 Feb '08

Hello, This is updated russian translation. It may contain some mistakes, please check it if you know russian. Any critics are welcome.

4 7

[pacman-dev] [PATCH] scripts: allow usage when gettext is not installed
by Dan McGee 18 Feb '08

18 Feb '08

Address the issue of our scripts not working so great when gettext is not available. This has come up in multiple bug reports, and is relatively easy to address by adding a simple check and a stub function if gettext was not found that simply echos the original message. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- This issue comes up a lot it seems, so I hope this simple check can fix things up for good. Can anyone see anything wrong with doing this? Quick tests locally seemed to make me think it works? Just rename some gettext calls to something you know does not exist, and change the patch below accordingly to test. Someone with a bit more bash knowledge and checking more complex strings with echo would be good to have here. I'd like to push this to 3.1.2 if there are no issues, as it is an easy and straightforward fix. -Dan scripts/gensync.sh.in | 7 +++++++ scripts/makepkg.sh.in | 9 +++++++++ scripts/pacman-optimize.sh.in | 9 +++++++++ scripts/repo-add.sh.in | 7 +++++++ scripts/repo-remove.sh.in | 7 +++++++ scripts/updatesync.sh.in | 7 +++++++ 6 files changed, 46 insertions(+), 0 deletions(-) diff --git a/scripts/gensync.sh.in b/scripts/gensync.sh.in index eb1ef3a..d5dec27 100644 --- a/scripts/gensync.sh.in +++ b/scripts/gensync.sh.in @@ -80,6 +80,13 @@ check_force () { # PROGRAM START +# determine whether we have gettext; make it a no-op if we do not +if [ ! $(type -t gettext) ]; then + gettext() { + echo "$@" + } +fi + if [ "$1" = "-h" -o "$1" = "--help" ]; then usage exit 0 diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 090ba5d..ed4794f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1107,6 +1107,15 @@ This is free software; see the source for copying conditions.\n\ There is NO WARRANTY, to the extent permitted by law.\n")" } +# PROGRAM START + +# determine whether we have gettext; make it a no-op if we do not +if [ ! $(type -t gettext) ]; then + gettext() { + echo "$@" + } +fi + ARGLIST=$@ #preserve environment variables diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index 21afd27..0cd108b 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -70,6 +70,15 @@ die_r() { die "$@" } +# PROGRAM START + +# determine whether we have gettext; make it a no-op if we do not +if [ ! $(type -t gettext) ]; then + gettext() { + echo "$@" + } +fi + if [ "$1" = "-h" -o "$1" = "--help" ]; then usage exit 0 diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index efd3bc0..63d94d3 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -252,6 +252,13 @@ db_write_entry() # PROGRAM START +# determine whether we have gettext; make it a no-op if we do not +if [ ! $(type -t gettext) ]; then + gettext() { + echo "$@" + } +fi + # check for help flags if [ "$1" = "-h" -o "$1" = "--help" ]; then usage diff --git a/scripts/repo-remove.sh.in b/scripts/repo-remove.sh.in index fe230b0..47a0d5a 100644 --- a/scripts/repo-remove.sh.in +++ b/scripts/repo-remove.sh.in @@ -95,6 +95,13 @@ db_remove_entry() { # PROGRAM START +# determine whether we have gettext; make it a no-op if we do not +if [ ! $(type -t gettext) ]; then + gettext() { + echo "$@" + } +fi + # check for help flags if [ "$1" = "-h" -o "$1" = "--help" ]; then usage diff --git a/scripts/updatesync.sh.in b/scripts/updatesync.sh.in index 58ae0d5..5f5cc6c 100644 --- a/scripts/updatesync.sh.in +++ b/scripts/updatesync.sh.in @@ -79,6 +79,13 @@ check_force () { # PROGRAM START +# determine whether we have gettext; make it a no-op if we do not +if [ ! $(type -t gettext) ]; then + gettext() { + echo "$@" + } +fi + if [ "$1" = "-h" -o "$1" = "--help" ]; then usage exit 0 -- 1.5.4.1

2 2

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.1.1-43-g2374c81
by Dan McGee 18 Feb '08

18 Feb '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 2374c81e55abc0f7252fad7eb53d2b75bb33f750 (commit) via 42f5579fd77e9b696024c4bc0eb5398c039c7256 (commit) via 3078494767be3c6b572f733384e745198388be7e (commit) via 273950473ea4fed67c0af0a4905bd3d3cbac15b3 (commit) from be95e4d8a008662eb0e19a3186953511551acec1 (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 2374c81e55abc0f7252fad7eb53d2b75bb33f750 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sun Feb 17 23:31:26 2008 +0100 Fix conflict progress bar with UTF-8 chars This fixes FS#6437. Dan already explained the problem in that bug report. Instead of letting printf deal with the length of utf8 strings, we can handle it more explicitly in the case of conflict progress bar, just like we do for add/remove progress bars. We compute the remaining space left for displaying the pkgname in case of add/remove, and an empty string in case of conflict. Before : (1/1) Prüfe auf Dateikonflikte [###################] 100% (1/1) Aktualisiere rxvt-unicode [###################] 100% After : (1/1) Prüfe auf Dateikonflikte [###################] 100% (1/1) Aktualisiere rxvt-unicode [###################] 100% Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 42f5579fd77e9b696024c4bc0eb5398c039c7256 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Feb 17 14:13:26 2008 -0600 Remove reference to gnome in DOC_DIRS Arch no longer installs Gnome here, and we should be stripping any doc dirs in /opt anyway, so generalize it. Fixes FS#9597. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3078494767be3c6b572f733384e745198388be7e Author: Juan Pablo Gonzalez <jotapesan(a)gmail.com> Date: Sun Feb 17 20:54:30 2008 +0100 Updated Spanish translation for 3.1.2 release Signed-off-by: Giovanni Scafora <linuxmania(a)gmail.com> commit 273950473ea4fed67c0af0a4905bd3d3cbac15b3 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Feb 16 17:44:21 2008 -0600 Add gettext call to 2 'failed' messages Noticed-by: Vojtěch Gondžala <vogo(a)seznam.cz> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: etc/makepkg.conf.in | 2 +- po/es.po | 17 ++++++++++------- src/pacman/add.c | 2 +- src/pacman/callback.c | 32 ++++++++------------------------ src/pacman/remove.c | 2 +- 5 files changed, 21 insertions(+), 34 deletions(-) hooks/post-receive -- The official pacman repository

1 0