- Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib/src/pacman (log.c sync.c)
by Aaron Griffin 16 Feb '07

16 Feb '07

Date: Thursday, February 15, 2007 @ 21:21:13 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: log.c (1.29 -> 1.30) sync.c (1.111 -> 1.112) * Bugfix FS#6422 - spacing for warning output. Due to the fact that we fixed MSG/ERR usage earlier, the trailing '\n's are no longer needed * Oddly enough - *ADDED* some '\n's to the sync_info errors (last commit) as the package info output does not use the pm_fprintf facility and thus does not honor our newline/no-newline setup --------+ log.c | 6 +++--- sync.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) Index: pacman-lib/src/pacman/log.c diff -u pacman-lib/src/pacman/log.c:1.29 pacman-lib/src/pacman/log.c:1.30 --- pacman-lib/src/pacman/log.c:1.29 Sat Feb 10 04:34:59 2007 +++ pacman-lib/src/pacman/log.c Thu Feb 15 21:21:13 2007 @@ -89,12 +89,12 @@ strftime(timestr, 9, "%H:%M:%S", tmp); timestr[8] = '\0'; - MSG(NL, "[%s] %s: %s\n", timestr, str, msg); + MSG(NL, "[%s] %s: %s", timestr, str, msg); } else { - MSG(NL, "%s: %s\n", str, msg); + MSG(NL, "%s: %s", str, msg); } #else - MSG(NL, "%s: %s\n", str, msg); + MSG(NL, "%s: %s", str, msg); #endif } Index: pacman-lib/src/pacman/sync.c diff -u pacman-lib/src/pacman/sync.c:1.111 pacman-lib/src/pacman/sync.c:1.112 --- pacman-lib/src/pacman/sync.c:1.111 Thu Feb 15 20:58:51 2007 +++ pacman-lib/src/pacman/sync.c Thu Feb 15 21:21:13 2007 @@ -340,7 +340,7 @@ } if(!db) { - ERR(NL, _("repository '%s' does not exist"), repo); + ERR(NL, _("repository '%s' does not exist\n"), repo); return(1); } @@ -356,7 +356,7 @@ } if(!foundpkg) { - ERR(NL, _("package '%s' was not found in repository '%s'"), pkgstr, repo); + ERR(NL, _("package '%s' was not found in repository '%s'\n"), pkgstr, repo); } } else { pkgstr = target; @@ -376,7 +376,7 @@ } } if(!foundpkg) { - ERR(NL, _("package '%s' was not found."), pkgstr); + ERR(NL, _("package '%s' was not found\n"), pkgstr); } } }

1 0

[pacman-dev] CVS update of pacman-lib/src/pacman (sync.c)
by Aaron Griffin 16 Feb '07

16 Feb '07

Date: Thursday, February 15, 2007 @ 20:58:51 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: sync.c (1.110 -> 1.111) * Bugfix for FS#6427: Allow -Si to use "repository/package" syntax * Also don't stop searching when one package is not found (output and continue) --------+ sync.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 52 insertions(+), 10 deletions(-) Index: pacman-lib/src/pacman/sync.c diff -u pacman-lib/src/pacman/sync.c:1.110 pacman-lib/src/pacman/sync.c:1.111 --- pacman-lib/src/pacman/sync.c:1.110 Wed Feb 14 14:35:41 2007 +++ pacman-lib/src/pacman/sync.c Thu Feb 15 20:58:51 2007 @@ -318,24 +318,66 @@ if(targets) { for(i = targets; i; i = alpm_list_next(i)) { - int found = 0; + pmdb_t *db = NULL; + int foundpkg = 0; - for(j = syncs; j && !found; j = alpm_list_next(j)) { - pmdb_t *db = alpm_list_getdata(j); + char target[512]; /* TODO is this enough space? */ + char *repo = NULL, *pkgstr = NULL; - for(k = alpm_db_getpkgcache(db); !found && k; k = alpm_list_next(k)) { + strncpy(target, i->data, 512); + pkgstr = strchr(target, '/'); + if(pkgstr) { + repo = target; + *pkgstr = '\0'; + ++pkgstr; + + for(j = syncs; j; j = alpm_list_next(j)) { + db = alpm_list_getdata(j); + if(strcmp(repo, alpm_db_get_name(db)) == 0) { + break; + } + db = NULL; + } + + if(!db) { + ERR(NL, _("repository '%s' does not exist"), repo); + return(1); + } + + for(k = alpm_db_getpkgcache(db); k; k = alpm_list_next(k)) { pmpkg_t *pkg = alpm_list_getdata(k); - if(!strcmp(alpm_pkg_get_name(pkg), alpm_list_getdata(i))) { + if(strcmp(alpm_pkg_get_name(pkg), pkgstr) == 0) { dump_pkg_sync(pkg, alpm_db_get_name(db)); MSG(NL, "\n"); - found = 1; + foundpkg = 1; + break; } } - } - if(!found) { - ERR(NL, _("package \"%s\" was not found.\n"), (char *)i->data); - break; + + if(!foundpkg) { + ERR(NL, _("package '%s' was not found in repository '%s'"), pkgstr, repo); + } + } else { + pkgstr = target; + + for(j = syncs; j; j = alpm_list_next(j)) { + pmdb_t *db = alpm_list_getdata(j); + + for(k = alpm_db_getpkgcache(db); k; k = alpm_list_next(k)) { + pmpkg_t *pkg = alpm_list_getdata(k); + + if(strcmp(alpm_pkg_get_name(pkg), pkgstr) == 0) { + dump_pkg_sync(pkg, alpm_db_get_name(db)); + MSG(NL, "\n"); + foundpkg = 1; + break; + } + } + } + if(!foundpkg) { + ERR(NL, _("package '%s' was not found."), pkgstr); + } } } } else {

1 0

[pacman-dev] RC 2007.02.12
by Aaron Griffin 15 Feb '07

15 Feb '07

Latest and greatest. This really doesn't include much. There were some x86_64 fixes I added (obviously not in this package) as well as some makepkg changes, and Dan and I improved the conflict checking significantly. This package, though, should have all the translations provided here, so test those out too. Enjoy. Hopefully this is the last before public testing begins

8 20

[pacman-dev] few output issues
by Roman Kyrylych 15 Feb '07

15 Feb '07

Issue #1: (8/8) checking for file conflicts [#####################] 100% (1/8) installing fbgrab [#####################] 100% IMO (8/8) is meaningless. Issue #2: On standard 80 char width terminal [#####################] has 21 #s which is odd number. Why not 20? (pacman2 has 16 #s) -- Roman Kyrylych (Роман Кирилич)

3 4

[pacman-dev] CVS update of pacman-lib/src/pacman (7 files)
by dan＠archlinux.org 15 Feb '07

15 Feb '07

Date: Thursday, February 15, 2007 @ 09:32:01 Author: dan Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: pacman.c (1.96 -> 1.97) po/de.po (1.5 -> 1.6) po/fr.po (1.3 -> 1.4) po/hu.po (1.3 -> 1.4) po/it.po (1.4 -> 1.5) po/pacman.pot (1.5 -> 1.6) po/pt_BR.po (1.4 -> 1.5) * Updated pt_BR translation (Douglas Soares de Andrade), and merged other language files with latest pot file. ---------------+ pacman.c | 2 po/de.po | 75 ++++++++++----- po/fr.po | 99 ++++++++++---------- po/hu.po | 99 ++++++++++---------- po/it.po | 14 +- po/pacman.pot | 4 po/pt_BR.po | 266 ++++++++++++++++++++++++++++++-------------------------- 7 files changed, 307 insertions(+), 252 deletions(-) The diff is longer than the limit of 39KB.

1 0

[pacman-dev] Is this a bug ?
by Douglas Soares de Andrade 15 Feb '07

15 Feb '07

Hi guys, Pacman3 cannot unzip zip files. See this: [douglas@ressonance mercury]$ makepkg ==> Entering fakeroot environment ==> Making package: mercury 1.9RC2-1 (Qui Fev 15 10:08:50 BRST 2007) ==> Checking Runtime Dependencies... ==> Checking Buildtime Dependencies... ==> Retrieving Sources... -> Found 1.9RC2.zip in build dir -> Found merxtra.tar.bz2 in build dir -> Found mercury in build dir -> Found Mercury.desktop in build dir -> Found license.txt in build dir ==> Validating source files with md5sums 1.9RC2.zip ... Passed merxtra.tar.bz2 ... Passed mercury ... Passed Mercury.desktop ... Passed license.txt ... Passed ==> Extracting Sources... ==> WARNING: file had trouble detecting type, assuming tar -> tar -xf 1.9RC2.zip tar: Este não parece ser um arquivo-tar tar: Pulando para o próximo cabeçalho tar: Saída por erro atrasada pelos erros anteriores ==> ERROR: Failed to extract 1.9RC2.zip ==> Aborting... And with pacman2 it works great.

4 3

[pacman-dev] New italian translation
by Giovanni Scafora 15 Feb '07

15 Feb '07

Hi guys, can you upgrade italian translation with these .po files? Thanks. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

3 3

[pacman-dev] CVS update of pacman-lib (7 files)
by dan＠archlinux.org 14 Feb '07

14 Feb '07

Date: Wednesday, February 14, 2007 @ 14:35:41 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: TODO.dan (1.9 -> 1.10) lib/libalpm/po/it.po (1.3 -> 1.4) lib/libalpm/po/libalpm.pot (1.4 -> 1.5) src/pacman/po/it.po (1.3 -> 1.4) src/pacman/po/pacman.pot (1.4 -> 1.5) src/pacman/sync.c (1.109 -> 1.110) src/pacman/trans.c (1.34 -> 1.35) * Updated Italian translation * Updated pot translation templates * Located culprit of progress bar moving when unicode characters are used, added a TODO note about it * Removed '(target)' string from the sync.c error message, just like we did from add.c yesterday * Updated my TODO ----------------------------+ TODO.dan | 18 +- lib/libalpm/po/it.po | 337 +++++++++++++++++++++---------------------- lib/libalpm/po/libalpm.pot | 325 ++++++++++++++++++++--------------------- src/pacman/po/it.po | 15 + src/pacman/po/pacman.pot | 99 ++++++------ src/pacman/sync.c | 2 src/pacman/trans.c | 18 +- 7 files changed, 408 insertions(+), 406 deletions(-) The diff is longer than the limit of 39KB.

2 1

Re: [pacman-dev] FS#6316: Pacman 3 release bugcatcher
by Dan McGee 14 Feb '07

14 Feb '07

On 2/14/07, Flyspray <bugs(a)archlinux.org> wrote: > THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. > > The following task has a new comment added: > > FS#6316 - Pacman 3 release bugcatcher > User who did this: - Björn Martensen (baze) > > ---------- > you should replace mkinitrd.conf with mkinitcpio.conf in the > pacman3.conf. > ---------- Before I make a wrong posting on this on Flyspray, we should NOT do this, correct? We want to get rid of all of those NoUpgrade lines anyway, and we want to get rid of that MD5 sum bug that was going on with this before, so putting it in there would not help that. If anything, dump mkinitrd.conf from that array would seem like the correct step. -Dan

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (package.c)
by Aaron Griffin 14 Feb '07

14 Feb '07

Date: Wednesday, February 14, 2007 @ 11:15:09 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: package.c (1.68 -> 1.69) * Fixed _alpm_pkg_compare_versions so that it does not output warnings if versions match. (reported by Travis Willard) -----------+ package.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.68 pacman-lib/lib/libalpm/package.c:1.69 --- pacman-lib/lib/libalpm/package.c:1.68 Tue Feb 13 03:15:38 2007 +++ pacman-lib/lib/libalpm/package.c Wed Feb 14 11:15:09 2007 @@ -150,16 +150,19 @@ _alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)"), local_pkg->name, local_pkg->version, db->treename, pkg->version); cmp = 0; - } else if(alpm_list_find_str(handle->ignorepkg, pkg->name)) { - /* package should be ignored (IgnorePkg) */ - _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"), - local_pkg->name, local_pkg->version, pkg->version); - cmp = 0; - } else if(_alpm_pkg_istoonew(pkg)) { - /* package too new (UpgradeDelay) */ - _alpm_log(PM_LOG_DEBUG, _("%s-%s: delaying upgrade of package (%s)"), - local_pkg->name, local_pkg->version, pkg->version); - cmp = 0; + } else if(cmp < 0) { + /* we have an upgrade, make sure we should actually do it */ + if(alpm_list_find_str(handle->ignorepkg, pkg->name)) { + /* package should be ignored (IgnorePkg) */ + _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"), + local_pkg->name, local_pkg->version, pkg->version); + cmp = 0; + } else if(_alpm_pkg_istoonew(pkg)) { + /* package too new (UpgradeDelay) */ + _alpm_log(PM_LOG_WARNING, _("%s-%s: delaying upgrade of package (%s)"), + local_pkg->name, local_pkg->version, pkg->version); + cmp = 0; + } } _alpm_log(PM_LOG_DEBUG, _("compare versions for %s: %s vs %s, result=%d"),

1 0