- Pacman-dev - lists.archlinux.org

[pacman-dev] -Qil regression
by Roman Kyrylych 10 Mar '07

10 Mar '07

Hi! This was already rised up by jra on IRC, but he asked to put info here. pacman -Qil was supported in pacman2 (see http://bugs.archlinux.org/task/1355) but isn't in pacman3. This is a regression. -- Roman Kyrylych (Роман Кирилич)

1 0

[pacman-dev] CVS update of pacman-lib (lib/libalpm/po/it.po src/pacman/package.c)
by Dan McGee 10 Mar '07

10 Mar '07

Date: Saturday, March 10, 2007 @ 15:36:20 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/po/it.po (1.17 -> 1.18) src/pacman/package.c (1.33 -> 1.34) * Updated Italian translation Giovanni Scafora <linuxmania(a)gmail.com> * long -> float conversion for package size output (which still may be the wrong size, this needs to be looked at) ----------------------+ lib/libalpm/po/it.po | 36 +++++++++++++++++------------------- src/pacman/package.c | 2 +- 2 files changed, 18 insertions(+), 20 deletions(-) Index: pacman-lib/lib/libalpm/po/it.po diff -u pacman-lib/lib/libalpm/po/it.po:1.17 pacman-lib/lib/libalpm/po/it.po:1.18 --- pacman-lib/lib/libalpm/po/it.po:1.17 Wed Mar 7 11:57:22 2007 +++ pacman-lib/lib/libalpm/po/it.po Sat Mar 10 15:36:20 2007 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: libalpm VERSION\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" -"POT-Creation-Date: 2007-03-07 11:45-0500\n" -"PO-Revision-Date: 2007-03-06 10:00+0100\n" +"POT-Creation-Date: 2007-03-10 20:25+0100\n" +"PO-Revision-Date: 2007-03-10 21:00+0100\n" "Last-Translator: Giovanni Scafora <linuxmania(a)gmail.com>\n" "Language-Team: Arch Linux Italian Team <linuxmania(a)gmail.com>\n" "MIME-Version: 1.0\n" @@ -30,7 +30,7 @@ #: lib/libalpm/add.c:131 #, c-format msgid "newer version %s-%s is in the target list -- skipping" -msgstr "è presente una versione più recente di %s-%s -- verrà ignorata" +msgstr "è presente una versione più recente di %s-%s e verrà ignorata" #: lib/libalpm/add.c:138 #, c-format @@ -202,7 +202,7 @@ #: lib/libalpm/add.c:680 #, c-format msgid "%s is in NoUpgrade -- skipping" -msgstr "%s è in NoUpgrade -- verrà ignorato" +msgstr "%s è in NoUpgrade e verrà ignorato" #: lib/libalpm/add.c:681 #, c-format @@ -469,12 +469,12 @@ #: lib/libalpm/alpm.c:1149 lib/libalpm/sync.c:194 #, c-format msgid "'%s' not found in sync db -- skipping" -msgstr "'%s' non trovato nel database -- ignorato" +msgstr "impossibile trovare '%s' nel database, verrà ignorato" #: lib/libalpm/alpm.c:1163 lib/libalpm/sync.c:208 lib/libalpm/sync.c:495 #, c-format msgid "'%s' is already elected for removal -- skipping" -msgstr "'%s' è già selezionato per la rimozione -- ignorato" +msgstr "'%s' è già selezionato per la rimozione, verrà ignorato" #: lib/libalpm/alpm.c:1169 #, c-format @@ -665,10 +665,8 @@ #: lib/libalpm/db.c:186 #, c-format -msgid "database directory '%s' does not exist, try creating it" -msgstr "" -"la directory del database '%s' non esiste, verrà fatto un tentativo per " -"crearla" +msgid "database directory '%s' does not exist, creating it" +msgstr "la directory del database '%s' non esiste e verrà creata" #: lib/libalpm/db.c:197 #, c-format @@ -726,7 +724,7 @@ #: lib/libalpm/deps.c:485 #, c-format msgid "excluding %s -- explicitly installed" -msgstr "esclusione di %s -- installato esplicitamente" +msgstr "esclusione di %s in corso, installato esplicitamente" #: lib/libalpm/deps.c:532 #, c-format @@ -745,7 +743,7 @@ #: lib/libalpm/deps.c:601 #, c-format msgid "%s provides dependency %s -- skipping" -msgstr "%s fornisce la dipendenza %s -- verrà ignorato" +msgstr "%s fornisce la dipendenza %s, verrà ignorato" #: lib/libalpm/deps.c:630 #, c-format @@ -759,7 +757,7 @@ #, c-format msgid "dependency %s is already in the target list -- skipping" msgstr "" -"la dipendenza %s è già presente nella lista dei pacchetti -- verrà ignorata" +"la dipendenza %s è già presente nella lista dei pacchetti e verrà ignorata" #: lib/libalpm/deps.c:667 #, c-format @@ -1100,7 +1098,7 @@ #: lib/libalpm/remove.c:124 #, c-format msgid "could not find %s in database -- skipping" -msgstr "impossibile trovare %s nel database -- verrà ignorato" +msgstr "impossibile trovare %s nel database, verrà ignorato" #: lib/libalpm/remove.c:142 msgid "finding removable dependencies" @@ -1208,7 +1206,7 @@ #: lib/libalpm/sync.c:270 lib/libalpm/sync.c:293 #, c-format msgid "target '%s' not found -- looking for provisions" -msgstr "pacchetto '%s' non trovato -- ricerca delle alternative" +msgstr "pacchetto '%s' non trovato, ricerca delle alternative in corso" #: lib/libalpm/sync.c:275 lib/libalpm/sync.c:298 #, c-format @@ -1223,7 +1221,7 @@ #: lib/libalpm/sync.c:323 #, c-format msgid "%s-%s is up to date -- skipping" -msgstr "%s-%s è aggiornato -- verrà ignorato" +msgstr "%s-%s è aggiornato, verrà ignorato" #: lib/libalpm/sync.c:346 #, c-format @@ -1251,7 +1249,7 @@ #: lib/libalpm/sync.c:502 #, c-format msgid "'%s' not found in transaction set -- skipping" -msgstr "impossibile trovare '%s' -- verrà ignorato" +msgstr "impossibile trovare '%s', verrà ignorato" #: lib/libalpm/sync.c:513 #, c-format @@ -1261,7 +1259,7 @@ #: lib/libalpm/sync.c:536 lib/libalpm/sync.c:541 #, c-format msgid "'%s' is in the target list -- keeping it" -msgstr "'%s' è nella lista dei pacchetti -- verrà conservato" +msgstr "'%s' è nella lista dei pacchetti e verrà conservato" #: lib/libalpm/sync.c:553 lib/libalpm/sync.c:590 #, c-format @@ -1294,7 +1292,7 @@ #: lib/libalpm/sync.c:698 #, c-format msgid "found '%s' as a provision for '%s' -- conflict aborted" -msgstr "trovato '%s' come alternativa a '%s' -- conflitto annullato" +msgstr "trovato '%s' come alternativa a '%s', conflitto annullato" #: lib/libalpm/sync.c:794 #, c-format Index: pacman-lib/src/pacman/package.c diff -u pacman-lib/src/pacman/package.c:1.33 pacman-lib/src/pacman/package.c:1.34 --- pacman-lib/src/pacman/package.c:1.33 Mon Mar 5 17:13:35 2007 +++ pacman-lib/src/pacman/package.c Sat Mar 10 15:36:20 2007 @@ -83,7 +83,7 @@ list_display(_("Required By :"), alpm_pkg_get_requiredby(pkg)); } list_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg)); - printf(_("Installed Size : %ld K\n"), (long)alpm_pkg_get_size(pkg) / 1024); + printf(_("Installed Size : %6.2f K\n"), (float)alpm_pkg_get_size(pkg) / 1024.0); printf(_("Packager : %s\n"), (char *)alpm_pkg_get_packager(pkg)); printf(_("Architecture : %s\n"), (char *)alpm_pkg_get_arch(pkg)); printf(_("Build Date : %s %s\n"), bdate, strlen(bdate) ? "UTC" : "");

1 0

[pacman-dev] 20070310 Italian translation
by Giovanni Scafora 10 Mar '07

10 Mar '07

Hi Dan, there is a new patch with some improvements to the italian translation. Thanks. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

1 0

[pacman-dev] patch] My speed improvement
by Nagy Gabor 10 Mar '07

10 Mar '07

Hi! This is in very early stage, just a proof of concept. Just for testing only (not merging to cvs). If you want to test it, after compiling, run 'pacman --repair' <- this creates the extra infos for the local db. Now .groups implemented only, so speedup will be seen with -Qg or similar. Fully compatible with the old db; it checks whether the speedup dotdir exists (if the answer is yes, it uses it). There is no option in "my" pacman to create speedup dirs for sync repos (because it should be downloaded in db.tar.gz), but if you want to play with it for testing, rename the repo to local and run 'pacman --repair' and rename back... Bye, Nagy Gabor My first test results: (after sync; echo 3 > /proc/sys/vm/drop_caches;) Old: real 0m4.522s user 0m0.029s sys 0m0.060s New: real 0m0.788s user 0m0.002s sys 0m0.012s

2 3

[pacman-dev] INFRQ_* confusion
by Nagy Gabor 10 Mar '07

10 Mar '07

Hi! The constants defined in db.h are not usual: First, it seems logical, that NONE==0x0, ALL=0xFF. However you may forget about this, like be_files.c (row 222): "if(info->infolevel & inforeq) { /* already loaded this info, do nothing */ return(0); }" As I see, the author thinks of inforeq as exactly one bit is set to 1. However, if inforeq=0xFF and infolevel!=0, this is a bug. And if inforeq=0, this condition is never true. Bye.

3 7

[pacman-dev] CVS update of pacman-lib/lib/libalpm (cache.c)
by Juergen Hoetzel 09 Mar '07

09 Mar '07

Date: Friday, March 9, 2007 @ 18:26:33 Author: juergen Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: cache.c (1.38 -> 1.39) fixed string comparison callback (patch from Nagy Gabor) ---------+ cache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: pacman-lib/lib/libalpm/cache.c diff -u pacman-lib/lib/libalpm/cache.c:1.38 pacman-lib/lib/libalpm/cache.c:1.39 --- pacman-lib/lib/libalpm/cache.c:1.38 Mon Mar 5 17:13:33 2007 +++ pacman-lib/lib/libalpm/cache.c Fri Mar 9 18:26:33 2007 @@ -214,7 +214,7 @@ /* gross signature forces us to * discard const */ (void *)alpm_pkg_get_name(pkg), - _alpm_grp_cmp); + strcmp); db->grpcache = alpm_list_add_sorted(db->grpcache, grp, _alpm_grp_cmp); } else { alpm_list_t *j; @@ -225,7 +225,7 @@ if(strcmp(grp->name, i->data) == 0) { const char *pkgname = alpm_pkg_get_name(pkg); if(!alpm_list_find_str(grp->packages, pkgname)) { - grp->packages = alpm_list_add_sorted(grp->packages, (void *)pkgname, _alpm_grp_cmp); + grp->packages = alpm_list_add_sorted(grp->packages, (void *)pkgname, strcmp); } } }

1 0

[pacman-dev] Double packet [pacman 3]
by Manuel Mazzuola 09 Mar '07

09 Mar '07

First, sorry for my english. If i try to upgrade my arch box, pacman say to me that all remote database are unreacheble. So i tried to modify the XferCommand like this : XferCommand = echo %u and i discover that the url isn't correct : ftp://ftp.archlinux.org/testing/os/i686/testing.db.tar.gz/testing.db.tar.gz ftp://ftp.archlinux.org/current/os/i686/current.db.tar.gz/current.db.tar.gz the correct one is ftp://ftp.archlinux.org/testing/os/i686/testing.db.tar.gz / i resolved the problem with this XferCommand : XferCommand = echo %u | awk '{ print(substr($1,0,index($1,"gz/")+1)) }' | xargs /usr/bin/wget --passive-ftp -c -O %o bye :)

2 1

[pacman-dev] CVS update of pacman-lib (3 files)
by Aaron Griffin 09 Mar '07

09 Mar '07

Date: Friday, March 9, 2007 @ 00:33:06 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/db.c (1.66 -> 1.67) lib/libalpm/remove.c (1.74 -> 1.75) src/pacman/deptest.c (1.18 -> 1.19) * Two fixes when running under a new root (-r|--root) - Check EACCES in can_remove_file, to verify - we're only checking for a read-only FS here... if write permissions fail, we can still remove it - Switched the message when creating DB directories from an error to a debug message * Fix the dep tests once and for all (it wasn't working for provides=() packages) ----------------------+ lib/libalpm/db.c | 2 +- lib/libalpm/remove.c | 6 +++--- src/pacman/deptest.c | 31 +++++++++++++++---------------- 3 files changed, 19 insertions(+), 20 deletions(-) Index: pacman-lib/lib/libalpm/db.c diff -u pacman-lib/lib/libalpm/db.c:1.66 pacman-lib/lib/libalpm/db.c:1.67 --- pacman-lib/lib/libalpm/db.c:1.66 Mon Mar 5 17:13:34 2007 +++ pacman-lib/lib/libalpm/db.c Fri Mar 9 00:33:06 2007 @@ -183,7 +183,7 @@ /* make sure the database directory exists */ snprintf(path, PATH_MAX, "%s%s/%s", handle->root, handle->dbpath, treename); if(stat(path, &buf) != 0 || !S_ISDIR(buf.st_mode)) { - _alpm_log(PM_LOG_ERROR, _("database directory '%s' does not exist, try creating it"), path); + _alpm_log(PM_LOG_DEBUG, _("database directory '%s' does not exist, creating it"), path); if(_alpm_makepath(path) != 0) { RET_ERR(PM_ERR_SYSTEM, NULL); } Index: pacman-lib/lib/libalpm/remove.c diff -u pacman-lib/lib/libalpm/remove.c:1.74 pacman-lib/lib/libalpm/remove.c:1.75 --- pacman-lib/lib/libalpm/remove.c:1.74 Mon Mar 5 17:13:34 2007 +++ pacman-lib/lib/libalpm/remove.c Fri Mar 9 00:33:06 2007 @@ -169,9 +169,9 @@ /* If we fail write permissions due to a read-only filesystem, abort. * Assume all other possible failures are covered somewhere else */ if(access(file, W_OK) == -1) { - if(access(file, F_OK) == 0) { - /* only return failure if the file ACTUALLY exists and we don't have - * permissions */ + if(errno != EACCES && access(file, F_OK) == 0) { + /* only return failure if the file ACTUALLY exists and we can't write to + * it - ignore "chmod -w" simple permission failures */ _alpm_log(PM_LOG_ERROR, _("cannot remove file '%s': %s"), file, strerror(errno)); return(0); Index: pacman-lib/src/pacman/deptest.c diff -u pacman-lib/src/pacman/deptest.c:1.18 pacman-lib/src/pacman/deptest.c:1.19 --- pacman-lib/src/pacman/deptest.c:1.18 Wed Mar 7 16:47:52 2007 +++ pacman-lib/src/pacman/deptest.c Fri Mar 9 00:33:06 2007 @@ -38,17 +38,6 @@ extern config_t *config; -static int chk_package(const char *pkgname, pmdepend_t *dep) -{ - pmpkg_t *pkg; - pkg = alpm_db_get_pkg(alpm_option_get_localdb(), pkgname); - - if(!pkg || !alpm_depcmp(pkg, dep)) { - return(1); - } - return(0); -} - int pacman_deptest(alpm_list_t *targets) { int retval = 0; @@ -60,32 +49,42 @@ for(i = targets; i; i = alpm_list_next(i)) { int found = 0; + pmpkg_t *pkg; pmdepend_t *dep; const char *target; alpm_list_t *j, *provides; target = alpm_list_getdata(i); + + /* splitdep modifies the string... we'll compensate for now */ + char *saved_target = NULL; + saved_target = calloc(strlen(target)+1, sizeof(char)); + strncpy(saved_target, target, strlen(target)); + dep = alpm_splitdep(target); - if(chk_package(target, dep) == 0) { + pkg = alpm_db_get_pkg(alpm_option_get_localdb(), target); + if(pkg && alpm_depcmp(pkg, dep)) { found = 1; } else { /* not found, can we find anything that provides this in the local DB? */ provides = alpm_db_whatprovides(alpm_option_get_localdb(), target); for(j = provides; j; j = alpm_list_next(j)) { - const char *provide; - provide = alpm_list_getdata(j); + pmpkg_t *pkg; + pkg = alpm_list_getdata(j); - if(chk_package(provide, dep) == 0) { + if(pkg && alpm_depcmp(pkg, dep)) { found = 1; + break; } } } if(!found) { - MSG(NL, _("requires: %s"), target); + MSG(NL, _("requires: %s"), saved_target); retval = 1; } + free(saved_target); } return(retval); }

1 0

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by Dan McGee 09 Mar '07

09 Mar '07

Date: Friday, March 9, 2007 @ 00:11:47 Author: dan Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.57 -> 1.58) * Another slight update, getting rid of -rf flags and clarifying a message. ---------+ makepkg | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.57 pacman-lib/scripts/makepkg:1.58 --- pacman-lib/scripts/makepkg:1.57 Thu Mar 8 23:35:04 2007 +++ pacman-lib/scripts/makepkg Fri Mar 9 00:11:47 2007 @@ -492,7 +492,7 @@ read answer answer=$(echo $answer | tr [:upper:] [:lower:]) if [ "$answer" = "yes" -o "$answer" = "y" ]; then - rm -rf "$SRCDEST"/* + rm "$SRCDEST"/* if [ $? -ne 0 ]; then error "Problem removing files; you may not have correct permissions in $SRCDEST" exit 1 @@ -507,8 +507,9 @@ exit 0 fi else - # SRCDEST undefined (should never happen) + # $SRCDEST is $startdir, two possibilities error "Source destination must be defined in makepkg.conf." + plain "In addition, please run makepkg -C outside of your cache directory." exit 1 fi fi

1 0

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by Dan McGee 09 Mar '07

09 Mar '07

Date: Thursday, March 8, 2007 @ 23:35:06 Author: dan Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.56 -> 1.57) * Added confirmation step to makepkg -C operation to ensure user is deleting exactly what they think they are. ---------+ makepkg | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.56 pacman-lib/scripts/makepkg:1.57 --- pacman-lib/scripts/makepkg:1.56 Sat Mar 3 13:38:57 2007 +++ pacman-lib/scripts/makepkg Thu Mar 8 23:35:04 2007 @@ -486,16 +486,28 @@ if [ "$CLEANCACHE" = "1" ]; then #fix flyspray feature request #5223 - if [ -n "$SRCDEST" ]; then - msg "Cleaning up source files from the cache." - rm -rf "$SRCDEST"/* - if [ $? -ne 0 ]; then - error "Problem removing files; you may not have correct permissions in $SRCDEST" - exit 1 + if [ -n "$SRCDEST" -a "$SRCDEST" != "$startdir" ]; then + msg "Cleaning up ALL files from $SRCDEST." + echo -n " Are you sure you wish to do this? [Y/n] " + read answer + answer=$(echo $answer | tr [:upper:] [:lower:]) + if [ "$answer" = "yes" -o "$answer" = "y" ]; then + rm -rf "$SRCDEST"/* + if [ $? -ne 0 ]; then + error "Problem removing files; you may not have correct permissions in $SRCDEST" + exit 1 + else + # removal worked + msg "Source cache cleaned." + exit 0 + fi else + # answer = no + "No files have been removed." exit 0 fi else + # SRCDEST undefined (should never happen) error "Source destination must be defined in makepkg.conf." exit 1 fi

1 0