- Pacman-dev - lists.archlinux.org

[pacman-dev] Sugestion to makepkg3 -g
by Douglas Soares de Andrade 24 Feb '07

24 Feb '07

Hi guys, Thanks for the great work with pacman :) I have been thinking and what about instead of: ==> Generating md5sums for source files md5sums=('e1bf4b2941249c223efc524151caaadc') ==> Generating sha1sums for source files sha1sums=('39059c20d7e3b07c552ee9a9a662db7dbc742363') Why not: ==> Generating md5sums and sha1sums for source files or ==> Generating checksums for source files md5sums=('e1bf4b2941249c223efc524151caaadc') sha1sums=('39059c20d7e3b07c552ee9a9a662db7dbc742363') Im asking this because it would make easier just to pass the mouse in the two lines and paste in the PKGBUILD. (this is what i do) And in the current behaviour, i have to copy all lines and then paste in the PKGBUILD and then remove what is not needed. I know its a comestic one, but it would be good. Thanks -- Douglas Soares de Andrade Archlinux Brasil - http://archlinux-br.org Paradigma Internet - http://www.paradigma.com.br

3 3

[pacman-dev] CVS update of pacman-lib/src/pacman/po (it.po)
by ,,, 24 Feb '07

24 Feb '07

Date: Friday, February 23, 2007 @ 11:36:32 Author: dan Path: /home/cvs-pacman/pacman-lib/src/pacman/po Modified: it.po (1.9 -> 1.10) * Updated Italian translation Giovanni Scafora <linuxmania(a)gmail.com> -------+ it.po | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) Index: pacman-lib/src/pacman/po/it.po diff -u pacman-lib/src/pacman/po/it.po:1.9 pacman-lib/src/pacman/po/it.po:1.10 --- pacman-lib/src/pacman/po/it.po:1.9 Thu Feb 22 16:34:52 2007 +++ pacman-lib/src/pacman/po/it.po Fri Feb 23 11:36:32 2007 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n" -"POT-Creation-Date: 2007-02-22 11:13-0500\n" -"PO-Revision-Date: 2007-02-21 20:00+0100\n" +"POT-Creation-Date: 2007-02-23 11:47+0100\n" +"PO-Revision-Date: 2007-02-23 12: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" @@ -61,15 +61,15 @@ #: src/pacman/add.c:127 src/pacman/sync.c:709 #, c-format -msgid "%s%s exists in both '%s' and '%s'\n" -msgstr "%s%s è presente in '%s' e in '%s'\n" +msgid "%s exists in both '%s' and '%s'\n" +msgstr "%s è già presente in '%s' e in '%s'\n" -#: src/pacman/add.c:134 src/pacman/sync.c:716 +#: src/pacman/add.c:133 src/pacman/sync.c:715 #, c-format -msgid "%s: %s%s exists in filesystem\n" -msgstr "%s: %s%s è già presente nel filesystem\n" +msgid "%s: %s exists in filesystem\n" +msgstr "%s: %s è già presente nel filesystem\n" -#: src/pacman/add.c:141 src/pacman/sync.c:723 src/pacman/sync.c:729 +#: src/pacman/add.c:139 src/pacman/sync.c:721 src/pacman/sync.c:727 msgid "" "\n" "errors occurred, no packages were upgraded.\n" @@ -77,18 +77,18 @@ "\n" "si sono verificati degli errori, nessun pacchetto è stato aggiornato.\n" -#: src/pacman/add.c:151 src/pacman/sync.c:652 +#: src/pacman/add.c:149 src/pacman/sync.c:652 #, c-format msgid ":: %.1f MB required, have %.1f MB" msgstr ":: %.1f MB richiesti, spazio a disposizione %.1f MB" -#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:702 +#: src/pacman/add.c:162 src/pacman/remove.c:138 src/pacman/sync.c:702 #, c-format msgid "failed to commit transaction (%s)\n" msgstr "impossibile eseguire l'operazione richiesta (%s)\n" -#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:524 -#: src/pacman/sync.c:745 +#: src/pacman/add.c:172 src/pacman/remove.c:148 src/pacman/sync.c:524 +#: src/pacman/sync.c:743 #, c-format msgid "failed to release transaction (%s)\n" msgstr "impossibile annullare l'operazione richiesta (%s)\n" @@ -1020,51 +1020,56 @@ msgid ":: %s requires %s, but it is in IgnorePkg. Install anyway? [Y/n] " msgstr ":: %s richiede %s, ma è in IgnorePkg. Installare ugualmente? [Y/n] " -#: src/pacman/trans.c:185 +#: src/pacman/trans.c:176 +#, c-format +msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] " +msgstr ":: %s è in IgnorePkg. Installare ugualmente? [Y/n] " + +#: src/pacman/trans.c:189 #, c-format msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] " msgstr ":: %s è in HoldPkg. Rimuovere ugualmente? [Y/n] " -#: src/pacman/trans.c:198 +#: src/pacman/trans.c:202 #, c-format msgid ":: Replace %s with %s/%s? [Y/n] " msgstr ":: Sostituire %s con %s/%s? [Y/n] " -#: src/pacman/trans.c:213 +#: src/pacman/trans.c:217 #, c-format msgid ":: %s conflicts with %s. Remove %s? [Y/n] " msgstr ":: %s va in conflitto con %s. Rimuovere %s? [Y/n] " -#: src/pacman/trans.c:229 +#: src/pacman/trans.c:233 #, c-format msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] " msgstr "" ":: %s-%s: la versione installata è più recente. Aggiornare ugualmente? [Y/n] " -#: src/pacman/trans.c:247 +#: src/pacman/trans.c:251 #, c-format msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] " msgstr "" ":: %s-%s: la versione installata è aggiornata. Aggiornare ugualmente? [Y/n] " -#: src/pacman/trans.c:265 +#: src/pacman/trans.c:269 #, c-format msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] " msgstr ":: L'archivio %s è corrotto. Eliminarlo? [Y/n] " -#: src/pacman/trans.c:319 +#: src/pacman/trans.c:323 msgid "installing" msgstr "installazione in corso di " -#: src/pacman/trans.c:322 +#: src/pacman/trans.c:326 msgid "upgrading" msgstr "aggiornamento in corso di" -#: src/pacman/trans.c:325 +#: src/pacman/trans.c:329 msgid "removing" msgstr "rimozione in corso di" -#: src/pacman/trans.c:328 +#: src/pacman/trans.c:332 msgid "checking for file conflicts" msgstr "controllo dei conflitti in corso"

1 0

[pacman-dev] Italian pacman it.po patch
by Giovanni Scafora 23 Feb '07

23 Feb '07

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

1 0

[pacman-dev] CVS update of pacman-lib/contrib (Makefile.am)
by Aaron Griffin 23 Feb '07

23 Feb '07

Date: Friday, February 23, 2007 @ 03:07:48 Author: aaron Path: /home/cvs-pacman/pacman-lib/contrib Modified: Makefile.am (1.1 -> 1.2) Whoops, added to Makefile.am -------------+ Makefile.am | 1 + 1 file changed, 1 insertion(+) Index: pacman-lib/contrib/Makefile.am diff -u pacman-lib/contrib/Makefile.am:1.1 pacman-lib/contrib/Makefile.am:1.2 --- pacman-lib/contrib/Makefile.am:1.1 Thu Feb 22 21:00:30 2007 +++ pacman-lib/contrib/Makefile.am Fri Feb 23 03:07:48 2007 @@ -1,5 +1,6 @@ EXTRA_DIST = \ bash_completion \ pacsearch \ + pacdiff \ zsh_completion

1 0

[pacman-dev] CVS update of pacman-lib/contrib (pacdiff)
by Aaron Griffin 23 Feb '07

23 Feb '07

Date: Friday, February 23, 2007 @ 03:03:50 Author: aaron Path: /home/cvs-pacman/pacman-lib/contrib Added: pacdiff (1.1) I had this laying around, figured someone might find it useful ---------+ pacdiff | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) Index: pacman-lib/contrib/pacdiff diff -u /dev/null pacman-lib/contrib/pacdiff:1.1 --- /dev/null Fri Feb 23 03:03:50 2007 +++ pacman-lib/contrib/pacdiff Fri Feb 23 03:03:50 2007 @@ -0,0 +1,47 @@ +#!/bin/sh +# pacdiff : a simple pacnew/pacorig/pacsave updater for /etc/ +# +# Copyright (c) 2007 Aaron Griffin <aaronmgriffin(a)gmail.com> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +# USA. +# + +# Original http://phraktured.net/config/bin/pacdiff + +diffprog=${DIFFPROG:-vimdiff} +for x in $(find /etc/ -name *.pacnew -o -name *.pacorig -o -name *.pacsave) +do + echo "File: ${x%.pac*}" + chk="$(cmp $x ${x%.pac*})" + if [ -z "${chk}" ]; then + echo " Files are identical, removing..." + rm $x + else + echo -n " File differences found. (V)iew, (S)kip, (R)emove: [v/s/r] " + read c + c="$(echo $c| tr A-Z a-z)" #tolower + if [ "$c" = "r" ]; then + rm $x + elif [ "$c" = "s" ]; then + continue + else + [ "$c" = "n" -o "$c" = "N" ] || $diffprog $x ${x%.pac*} + echo -n " Remove file? [Y/n] " + read c + [ "$c" = "n" -o "$c" = "N" ] || rm $x + fi + fi +done

1 0

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

23 Feb '07

Date: Friday, February 23, 2007 @ 03:00:09 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: package.c (1.76 -> 1.77) * The info level for this was wrong, causing replacements to not really work -----------+ package.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.76 pacman-lib/lib/libalpm/package.c:1.77 --- pacman-lib/lib/libalpm/package.c:1.76 Fri Feb 23 02:53:25 2007 +++ pacman-lib/lib/libalpm/package.c Fri Feb 23 03:00:06 2007 @@ -861,8 +861,8 @@ ASSERT(handle != NULL, return(NULL)); ASSERT(pkg != NULL, return(NULL)); - if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DEPENDS)) { - _alpm_db_read(pkg->data, pkg, INFRQ_DEPENDS); + if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DESC)) { + _alpm_db_read(pkg->data, pkg, INFRQ_DESC); } return pkg->replaces; }

1 0

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

23 Feb '07

Date: Friday, February 23, 2007 @ 02:53:25 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: package.c (1.75 -> 1.76) sync.c (1.103 -> 1.104) * Too much debugging output in the alpm_pkg_compare_versions function * Using the wrong info level for replacements -----------+ package.c | 3 --- sync.c | 20 +++++++++++++------- 2 files changed, 13 insertions(+), 10 deletions(-) Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.75 pacman-lib/lib/libalpm/package.c:1.76 --- pacman-lib/lib/libalpm/package.c:1.75 Thu Feb 22 21:10:56 2007 +++ pacman-lib/lib/libalpm/package.c Fri Feb 23 02:53:25 2007 @@ -167,9 +167,6 @@ } } - _alpm_log(PM_LOG_DEBUG, _("compare versions for %s: %s vs %s, result=%d"), - local_pkg->name, local_pkg->version, pkg->version, cmp); - return(cmp); } Index: pacman-lib/lib/libalpm/sync.c diff -u pacman-lib/lib/libalpm/sync.c:1.103 pacman-lib/lib/libalpm/sync.c:1.104 --- pacman-lib/lib/libalpm/sync.c:1.103 Thu Feb 22 21:10:56 2007 +++ pacman-lib/lib/libalpm/sync.c Fri Feb 23 02:53:25 2007 @@ -121,28 +121,34 @@ static int find_replacements(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync) { - alpm_list_t *i, *j, *k; + alpm_list_t *i, *j, *k, *m; /* wow */ ALPM_LOG_FUNC; /* check for "recommended" package replacements */ _alpm_log(PM_LOG_DEBUG, _("checking for package replacements")); for(i = dbs_sync; i; i = i->next) { - for(j = _alpm_db_get_pkgcache(i->data, INFRQ_DEPENDS); j; j = j->next) { + pmdb_t *db = i->data; + + /* for each db, check each package's REPLACES list */ + for(j = _alpm_db_get_pkgcache(db, INFRQ_DESC); j; j = j->next) { pmpkg_t *spkg = j->data; - for(k = spkg->replaces; k; k = k->next) { - alpm_list_t *m; + + for(k = alpm_pkg_get_replaces(spkg); k; k = k->next) { + const char *replacement = k->data; + /* compare to local DB */ for(m = _alpm_db_get_pkgcache(db_local, INFRQ_NONE); m; m = m->next) { pmpkg_t *lpkg = m->data; - if(strcmp(k->data, lpkg->name) == 0) { - _alpm_log(PM_LOG_DEBUG, _("checking replacement '%s' for package '%s'"), k->data, spkg->name); + + if(strcmp(replacement, lpkg->name) == 0) { + _alpm_log(PM_LOG_DEBUG, _("checking replacement '%s' for package '%s'"), replacement, spkg->name); if(alpm_list_find_str(handle->ignorepkg, lpkg->name)) { _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (to be replaced by %s-%s)"), lpkg->name, lpkg->version, spkg->name, spkg->version); } else { /* get confirmation for the replacement */ int doreplace = 0; - QUESTION(trans, PM_TRANS_CONV_REPLACE_PKG, lpkg, spkg, ((pmdb_t *)i->data)->treename, &doreplace); + QUESTION(trans, PM_TRANS_CONV_REPLACE_PKG, lpkg, spkg, db->treename, &doreplace); if(doreplace) { /* if confirmed, add this to the 'final' list, designating 'lpkg' as

1 0

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

23 Feb '07

Date: Friday, February 23, 2007 @ 02:50:35 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: add.c (1.31 -> 1.32) sync.c (1.113 -> 1.114) * conflicts are returned with the full path, so prepending root is redundant --------+ add.c | 6 ++---- sync.c | 8 +++----- 2 files changed, 5 insertions(+), 9 deletions(-) Index: pacman-lib/src/pacman/add.c diff -u pacman-lib/src/pacman/add.c:1.31 pacman-lib/src/pacman/add.c:1.32 --- pacman-lib/src/pacman/add.c:1.31 Tue Feb 13 23:52:17 2007 +++ pacman-lib/src/pacman/add.c Fri Feb 23 02:50:35 2007 @@ -124,16 +124,14 @@ pmconflict_t *conflict = alpm_list_getdata(i); switch(alpm_conflict_get_type(conflict)) { case PM_CONFLICT_TYPE_TARGET: - MSG(NL, _("%s%s exists in both '%s' and '%s'\n"), - alpm_option_get_root(), + MSG(NL, _("%s exists in both '%s' and '%s'\n"), alpm_conflict_get_file(conflict), alpm_conflict_get_target(conflict), alpm_conflict_get_ctarget(conflict)); break; case PM_CONFLICT_TYPE_FILE: - MSG(NL, _("%s: %s%s exists in filesystem\n"), + MSG(NL, _("%s: %s exists in filesystem\n"), alpm_conflict_get_target(conflict), - alpm_option_get_root(), alpm_conflict_get_file(conflict)); break; } Index: pacman-lib/src/pacman/sync.c diff -u pacman-lib/src/pacman/sync.c:1.113 pacman-lib/src/pacman/sync.c:1.114 --- pacman-lib/src/pacman/sync.c:1.113 Wed Feb 21 03:16:26 2007 +++ pacman-lib/src/pacman/sync.c Fri Feb 23 02:50:35 2007 @@ -511,7 +511,7 @@ * when sysupgrade'ing with an older version of pacman. */ data = alpm_trans_get_packages(); - for(i = alpm_list_first(data); i; i = alpm_list_next(i)) { + for(i = data; i; i = alpm_list_next(i)) { pmsyncpkg_t *sync = alpm_list_getdata(i); pmpkg_t *spkg = alpm_sync_get_package(sync); if(strcmp("pacman", alpm_pkg_get_name(spkg)) == 0 && alpm_list_count(data) > 1) { @@ -706,16 +706,14 @@ pmconflict_t *conflict = alpm_list_getdata(i); switch(alpm_conflict_get_type(conflict)) { case PM_CONFLICT_TYPE_TARGET: - MSG(NL, _("%s%s exists in both '%s' and '%s'\n"), - alpm_option_get_root(), + MSG(NL, _("%s exists in both '%s' and '%s'\n"), alpm_conflict_get_file(conflict), alpm_conflict_get_target(conflict), alpm_conflict_get_ctarget(conflict)); break; case PM_CONFLICT_TYPE_FILE: - MSG(NL, _("%s: %s%s exists in filesystem\n"), + MSG(NL, _("%s: %s exists in filesystem\n"), alpm_conflict_get_target(conflict), - alpm_option_get_root(), alpm_conflict_get_file(conflict)); break; }

1 0

[pacman-dev] CVS update of pacman-lib (contrib/.cvsignore etc/abs/supfile.testing)
by dan＠archlinux.org 23 Feb '07

23 Feb '07

Date: Friday, February 23, 2007 @ 02:45:15 Author: dan Path: /home/cvs-pacman/pacman-lib Added: contrib/.cvsignore (1.1) Modified: etc/abs/supfile.testing (1.1 -> 1.2) * added contrib/.cvsignore, and slight change to supfile.testing -------------------------+ contrib/.cvsignore | 2 ++ etc/abs/supfile.testing | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) Index: pacman-lib/contrib/.cvsignore diff -u /dev/null pacman-lib/contrib/.cvsignore:1.1 --- /dev/null Fri Feb 23 02:45:15 2007 +++ pacman-lib/contrib/.cvsignore Fri Feb 23 02:45:15 2007 @@ -0,0 +1,2 @@ +Makefile +Makefile.in Index: pacman-lib/etc/abs/supfile.testing diff -u pacman-lib/etc/abs/supfile.testing:1.1 pacman-lib/etc/abs/supfile.testing:1.2 --- pacman-lib/etc/abs/supfile.testing:1.1 Tue Dec 5 02:30:15 2006 +++ pacman-lib/etc/abs/supfile.testing Fri Feb 23 02:45:15 2007 @@ -1,5 +1,5 @@ # -# /etc/abs/supfile +# /etc/abs/supfile.testing # # this is the host containing the master ABS files

1 0

[pacman-dev] CVS update of pacman-lib/pactest/tests (remove020.py remove021.py)
by dan＠archlinux.org 23 Feb '07

23 Feb '07

Date: Friday, February 23, 2007 @ 02:04:12 Author: dan Path: /home/cvs-pacman/pacman-lib/pactest/tests Modified: remove020.py (1.2 -> 1.3) remove021.py (1.2 -> 1.3) * Oops. Messed a few things up, fixing them now. --------------+ remove020.py | 2 +- remove021.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: pacman-lib/pactest/tests/remove020.py diff -u pacman-lib/pactest/tests/remove020.py:1.2 pacman-lib/pactest/tests/remove020.py:1.3 --- pacman-lib/pactest/tests/remove020.py:1.2 Fri Feb 23 01:50:42 2007 +++ pacman-lib/pactest/tests/remove020.py Fri Feb 23 02:04:12 2007 @@ -5,7 +5,7 @@ p1.backup = ["etc/dummy.conf"] self.addpkg2db("local", p1) -self.args = "-R %s" % p1.name +self.args = "-Rn %s" % p1.name self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=dummy") Index: pacman-lib/pactest/tests/remove021.py diff -u pacman-lib/pactest/tests/remove021.py:1.2 pacman-lib/pactest/tests/remove021.py:1.3 --- pacman-lib/pactest/tests/remove021.py:1.2 Fri Feb 23 01:50:42 2007 +++ pacman-lib/pactest/tests/remove021.py Fri Feb 23 02:04:12 2007 @@ -5,7 +5,7 @@ p1.backup = ["etc/dummy.conf"] self.addpkg2db("local", p1) -self.args = "-R %s" % p1.name +self.args = "-Rn %s" % p1.name self.addrule("PACMAN_RETCODE=0") self.addrule("!PKG_EXIST=dummy")

1 0