- Pacman-dev - lists.archlinux.org

[pacman-dev] makepkg with gettext support
by Giovanni Scafora 28 Mar '07

28 Mar '07

Hi guys, I send my initial work on makepkg with gettext support. I guess that it's not still perfect, but I would appreciate a lot the contribution of all the translators and the pacman developers. All the suggestions are appreciated. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

2 5

[pacman-dev] CVS update of pacman-lib/lib/libalpm (sync.c)
by Dan McGee 28 Mar '07

28 Mar '07

Date: Wednesday, March 28, 2007 @ 00:32:00 Author: dan Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: sync.c (1.112 -> 1.113) Fix --ignore behavior on sysupgrade * --ignore was being ignored (haha) on sysupgrade when a package was listed as being a force upgrade. This adds a prompt to the user in this case asking what to do. Signed-off-by: Dan McGee <dan(a)archlinux.org> --------+ sync.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) Index: pacman-lib/lib/libalpm/sync.c diff -u pacman-lib/lib/libalpm/sync.c:1.112 pacman-lib/lib/libalpm/sync.c:1.113 --- pacman-lib/lib/libalpm/sync.c:1.112 Tue Mar 20 23:08:19 2007 +++ pacman-lib/lib/libalpm/sync.c Wed Mar 28 00:32:00 2007 @@ -216,14 +216,22 @@ alpm_pkg_get_name(local), alpm_pkg_get_version(local), alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg)); if(!_alpm_sync_find(trans->packages, alpm_pkg_get_name(spkg))) { - pmpkg_t *dummy = _alpm_pkg_new(alpm_pkg_get_name(local), - alpm_pkg_get_version(local)); - if(dummy == NULL) { + /* If package is in the ignorepkg list, ask before we add it to + * the transaction */ + if(alpm_list_find_str(handle->ignorepkg, alpm_pkg_get_name(local))) { + int resp = 0; + QUESTION(trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, local, NULL, NULL, &resp); + if(!resp) { + continue; + } + } + pmpkg_t *tmp = _alpm_pkg_dup(local); + if(tmp == NULL) { goto error; } - sync = _alpm_sync_new(PM_SYNC_TYPE_UPGRADE, spkg, dummy); + sync = _alpm_sync_new(PM_SYNC_TYPE_UPGRADE, spkg, tmp); if(sync == NULL) { - FREEPKG(dummy); + FREEPKG(tmp); goto error; } trans->packages = alpm_list_add(trans->packages, sync);

1 0

[pacman-dev] CVS update of pacman-lib/doc (pacman.conf.5)
by Dan McGee 27 Mar '07

27 Mar '07

Date: Tuesday, March 27, 2007 @ 11:51:18 Author: dan Path: /home/cvs-pacman/pacman-lib/doc Modified: pacman.conf.5 (1.3 -> 1.4) * Remove outdated ProxyServer option from pacman.conf.5. ---------------+ pacman.conf.5 | 3 --- 1 file changed, 3 deletions(-) Index: pacman-lib/doc/pacman.conf.5 diff -u pacman-lib/doc/pacman.conf.5:1.3 pacman-lib/doc/pacman.conf.5:1.4 --- pacman-lib/doc/pacman.conf.5:1.3 Thu Feb 22 22:23:07 2007 +++ pacman-lib/doc/pacman.conf.5 Tue Mar 27 11:51:18 2007 @@ -54,9 +54,6 @@ Include another config file. This file can include repositories or general configuration options. .TP -.B ProxyServer = <\fIhost\fP|\fIip\fP>[:\fIport\fP] -If set, \fBpacman\fP will use this proxy server for all ftp/http transfers. -.TP .B XferCommand = \fI/path/to/command %u\fP If set, an external program will be used to download all remote files. All instances of \fB%u\fP will be replaced with the download URL. If present,

1 0

[pacman-dev] makepkg using Proxy
by Gustavo Chain 27 Mar '07

27 Mar '07

Hi all! Dont' you think that makepkg should use ProxySettings from pacman.conf. ? What dou you think about ? -- Gustavo Chaín Dumit Alumno de Ingeniería de Ejecución Informática Pontificia Universidad Católica de Valparaiso http://aleph.homeunix.com/~gchain

4 6

[pacman-dev] makepkg FS#6708 patch
by Scott Horowitz 27 Mar '07

27 Mar '07

As per FS#6708, here is a patch against makepkg to download the first 50kb of the db.tar.gz file. Feel free to tweak the number, I thought it was a good balance between getting an accurate number and making dialup users wait. --- /usr/bin/rankmirrors 2007-03-25 20:07:04.000000000 -0600 +++ rankmirrors 2007-03-26 22:39:23.000000000 -0600 @@ -55,7 +55,8 @@ def talkToServer(serverUrl): opener = urllib2.build_opener() - tmp = opener.open(serverUrl).read() + # retrieve first 50,000 bytes only + tmp = opener.open(serverUrl).read(50000) def getFuncToTime(serverUrl): return lambda : talkToServer(serverUrl) @@ -139,8 +140,18 @@ elif options.times: print ' * ', sys.stdout.flush() + + # add db.tar.gz to server name + try: + splitted2 = serverUrl.split('/') + dbFileName = splitted2[len(splitted2) - 3] + '.db.tar.gz' + if serverUrl[-1] != '/': + dbFileName = '/' + dbFileName + except: + dbFileName = '' + try: - serverToTime[serverUrl] = timeCmd(getFuncToTime(serverUrl)) + serverToTime[serverUrl] = timeCmd(getFuncToTime(serverUrl + dbFileName)) if options.verbose: try: print "%.2f" % serverToTime[serverUrl]

1 2

[pacman-dev] Russian translation update.
by Владимир Байраковский 26 Mar '07

26 Mar '07

Hi! This is a new patch for src/pacman/po/ru_RU.po Now it looks like finished translation. But improvements are welcome. Thanks a lot, shild <sxp(a)bk.ru>!

2 1

[pacman-dev] CVS update of pacman-lib (NEWS src/pacman/po/ru_RU.po src/pacman/sync.c)
by Dan McGee 26 Mar '07

26 Mar '07

Date: Monday, March 26, 2007 @ 18:47:57 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: NEWS (1.11 -> 1.12) src/pacman/po/ru_RU.po (1.6 -> 1.7) src/pacman/sync.c (1.117 -> 1.118) * Fix NEWS typo. Oops. * Updated Russian translation. Владимир Байраковский <4rayven(a)gmail.com> and Shild <sxp(a)bk.ru> * Removed a string from gettext that didn't need it. ------------------------+ NEWS | 2 - src/pacman/po/ru_RU.po | 54 ++++++++++++++++++++++++----------------------- src/pacman/sync.c | 2 - 3 files changed, 30 insertions(+), 28 deletions(-) Index: pacman-lib/NEWS diff -u pacman-lib/NEWS:1.11 pacman-lib/NEWS:1.12 --- pacman-lib/NEWS:1.11 Thu Mar 22 11:18:26 2007 +++ pacman-lib/NEWS Mon Mar 26 18:47:56 2007 @@ -47,7 +47,7 @@ - repo-add - adds a package to a repo database file - repo-remove - removes a package from a repo database file - added pactest testing suite - - MANY fixes and small inprovements everywhere + - MANY fixes and small improvements everywhere 2.9.8 - Changed behaviour with original=X,current=Y,new=Z scenario - keep old in place, install new as .pacnew - Search package provides when finding matching targets with -S Index: pacman-lib/src/pacman/po/ru_RU.po diff -u pacman-lib/src/pacman/po/ru_RU.po:1.6 pacman-lib/src/pacman/po/ru_RU.po:1.7 --- pacman-lib/src/pacman/po/ru_RU.po:1.6 Sat Mar 24 00:18:19 2007 +++ pacman-lib/src/pacman/po/ru_RU.po Mon Mar 26 18:47:57 2007 @@ -1,5 +1,5 @@ # Pacman Russian Translation -# Copyright (C) YEAR Judd Vinet <jvinet(a)zeroflux.org> +# Copyright (C) 2007 Judd Vinet <jvinet(a)zeroflux.org> # This file is distributed under the same license as the Pacman package. # Vladimir Bayrakovskiy <4rayven(a)gmail.com>, 2007 # @@ -7,12 +7,15 @@ msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" -"POT-Creation-Date: 2007-03-23 20:46-0500\n" +"POT-Creation-Date: 2007-03-25 17:41+0600\n" "PO-Revision-Date: 2007-03-07 11:45-0500\n" "Last-Translator: Vladimir Bayrakovskiy <4rayven(a)gmail.com>\n" +"Language-Team: Russian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: src/pacman/add.c:72 src/pacman/remove.c:82 src/pacman/sync.c:482 #: src/pacman/sync.c:531 @@ -31,7 +34,7 @@ #: src/pacman/add.c:83 #, c-format msgid "failed to add target '%s' (%s)" -msgstr "" +msgstr "не удалось добавить цель '%s' (%s)" #: src/pacman/add.c:88 src/pacman/sync.c:196 src/pacman/trans.c:73 #: src/pacman/trans.c:80 src/pacman/trans.c:91 src/pacman/trans.c:105 @@ -115,11 +118,11 @@ #: src/pacman/log.c:194 msgid "Y" -msgstr "" +msgstr "Y" #: src/pacman/log.c:194 msgid "YES" -msgstr "" +msgstr "YES" #: src/pacman/log.h:30 msgid "error: " @@ -230,11 +233,11 @@ #: src/pacman/package.c:96 msgid "Yes" -msgstr "" +msgstr "Yes" #: src/pacman/package.c:96 msgid "No" -msgstr "" +msgstr "No" #: src/pacman/package.c:126 #, c-format @@ -303,7 +306,7 @@ #: src/pacman/pacman.c:91 #, c-format msgid " %s {-V --version}\n" -msgstr "" +msgstr " %s {-V --version}\n" #: src/pacman/pacman.c:92 #, c-format @@ -454,7 +457,7 @@ msgid "" " -m, --foreign list installed packages not found in sync db(s)\n" msgstr "" -" -m, --foreign показать все пакеты не найденные в базе данных(s)\n" +" -m, --foreign показать все пакеты не найденные в базе(ах) данных\n" #: src/pacman/pacman.c:132 #, c-format @@ -465,7 +468,7 @@ #, c-format msgid " -p, --file <package> query a package file instead of the database\n" msgstr "" -" -p, --file <пакет> извлечь информацию из файла пакета <пакет>, а не из " +" -p, --file <пакет> извлечь информацию из файла пакета <пакет>, а не из " "базы данных\n" #: src/pacman/pacman.c:134 @@ -474,7 +477,7 @@ " -s, --search <regex> search locally-installed packages for matching " "strings\n" msgstr "" -" -s, --search <regex> искать указанную строку в локально установленных " +" -s, --search <regex> искать указанную строку в локально установленных " "пакетах\n" #: src/pacman/pacman.c:135 @@ -506,8 +509,7 @@ #: src/pacman/pacman.c:145 #, c-format msgid " -l, --list <repo> view a list of packages in a repo\n" -msgstr "" -" -l, --list <repo> показать список всех пакетов в репозитории repo\n" +msgstr " -l, --list <repo> показать все пакеты данного репозитория\n" #: src/pacman/pacman.c:146 #, c-format @@ -553,14 +555,14 @@ " --ignore <pkg> ignore a package upgrade (can be used more than " "once)\n" msgstr "" -" --ignore <pkg> игнорировать пакет при обновлении (может быть " +" --ignore <пакет> игнорировать пакет при обновлении (может быть " "использовано неоднократно)\n" #: src/pacman/pacman.c:153 #, c-format msgid " --config <path> set an alternate configuration file\n" msgstr "" -" --config <path> использовать альтернативный конфигурационный файл\n" +" --config <путь> использовать альтернативный конфигурационный файл\n" #: src/pacman/pacman.c:154 #, c-format @@ -572,7 +574,7 @@ msgid "" " --ask <number> pre-specify answers for questions (see manpage)\n" msgstr "" -" --ask <number> заранее подготовленные ответы на вопросы (смотрите " +" --ask <число> заранее подготовленные ответы на вопросы (смотрите " "man-страницу)\n" #: src/pacman/pacman.c:156 @@ -597,30 +599,30 @@ #, c-format msgid " -r, --root <path> set an alternate installation root\n" msgstr "" -" -r, --root <path> указать алтернативную корневую директорию для " +" -r, --root <путь> указать альтернативную корневую директорию для " "установки\n" #: src/pacman/pacman.c:160 #, c-format msgid " -b, --dbpath <path> set an alternate database location\n" msgstr "" -" -b, --dbpath <path> указать альтернативное расположение базы данных\n" +" -b, --dbpath <путь> указать альтернативное расположение базы данных\n" #: src/pacman/pacman.c:161 #, c-format msgid " --cachedir <dir> set an alternate package cache location\n" -msgstr "" -" --cachedir <директория> указать альтернативное расположение кэша\n" +msgstr " --cachedir <dir> указать альтернативное расположение кэша\n" #: src/pacman/pacman.c:174 #, c-format msgid " This program may be freely redistributed under\n" msgstr "" +" This program may be freely redistributed under\n" #: src/pacman/pacman.c:175 #, c-format msgid " the terms of the GNU General Public License\n" -msgstr "" +msgstr " the terms of the GNU General Public License\n" #: src/pacman/pacman.c:300 #, c-format @@ -648,7 +650,7 @@ #: src/pacman/pacman.c:436 msgid "warning: current locale is invalid; using default \"C\" locale" -msgstr "" +msgstr "warning: current locale is invalid; using default \"C\" locale" #: src/pacman/pacman.c:456 #, c-format @@ -692,12 +694,12 @@ #: src/pacman/query.c:100 msgid "cannot determine ownership of a directory" -msgstr "не удается определить владельца директории" +msgstr "не удалось определить владельца каталога" #: src/pacman/query.c:105 #, c-format msgid "cannot determine real path for '%s': %s" -msgstr "" +msgstr "не удалось определить настоящий путь для '%s': %s" #: src/pacman/query.c:119 #, c-format @@ -887,12 +889,12 @@ #: src/pacman/sync.c:537 #, c-format msgid "pacman: %s\n" -msgstr "" +msgstr "pacman: %s\n" #: src/pacman/sync.c:557 #, c-format msgid "'%s': %s\n" -msgstr "" +msgstr "'%s': %s\n" #: src/pacman/sync.c:572 msgid ":: Install whole content? [Y/n] " Index: pacman-lib/src/pacman/sync.c diff -u pacman-lib/src/pacman/sync.c:1.117 pacman-lib/src/pacman/sync.c:1.118 --- pacman-lib/src/pacman/sync.c:1.117 Mon Mar 19 00:23:45 2007 +++ pacman-lib/src/pacman/sync.c Mon Mar 26 18:47:56 2007 @@ -554,7 +554,7 @@ continue; } if(pm_errno != PM_ERR_PKG_NOT_FOUND) { - ERR(NL, _("'%s': %s\n"), (char *)i->data, alpm_strerror(pm_errno)); + ERR(NL, "'%s': %s\n", (char *)i->data, alpm_strerror(pm_errno)); retval = 1; goto cleanup; }

1 0

[pacman-dev] CVS update of pacman-lib (NEWS)
by Dan McGee 26 Mar '07

26 Mar '07

Date: Thursday, March 22, 2007 @ 11:18:26 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: NEWS (1.10 -> 1.11) Roman Kyrylych <roman.kyrylych(a)gmail.com> * Updates to news file. ------+ NEWS | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) Index: pacman-lib/NEWS diff -u pacman-lib/NEWS:1.10 pacman-lib/NEWS:1.11 --- pacman-lib/NEWS:1.10 Tue Mar 20 01:47:11 2007 +++ pacman-lib/NEWS Thu Mar 22 11:18:26 2007 @@ -1,40 +1,53 @@ VERSION DESCRIPTION ----------------------------------------------------------------------------- 3.0.0 - first release based on libalpm backend - - added internationalization (gettext) support - - prompt to delete corrupted packages + - added internationalization (gettext) support: + - de, fr, hu, it, pt_BR, en_GB, ru_RU translations + - switch to usage of libdownload and libarchive + - improved proxy support using libdownload - documentation - man pages updated, new conf manpages added + - repository mirror list updates - added support for package changelogs - logging of all install scriptlet messages to pacman.log - - repository mirror list updates - orphans search (-Qe) now shows true orphans - - new -Qu option- show all packages that can be upgraded + - new -Qu option - show all packages that can be upgraded + - new -Se option - install only dependencies - dependency sorting on install and removal - - improved backup handling- backup array is proactive on upgrade - - new uncompressed size field, shown on sync upgrade - check for free space before installing packages + - prompt to delete corrupted packages + - improved backup handling - backup array proactive on upgrade + - removed NoUpgrade lines from default pacman.conf + - new uncompressed size field, shown on sync upgrade - improved progress and progressbar output - reduced unnecessary calling of ldconfig - selective loading of database to speed up certain operations - - switch to usage of libdownload and libarchive - - improved proxy support as a result of switch to libdownload - debugging output improved with --debug flag - - added 'rankmirrors' - script to show best available mirrors - - added 'repo-add' - the backbone script for building repos - - added pactest testing suite - - abs - supports cvsup/csup, expanded configuration - - abs - supports fetching of testing repository - - makepkg fixes: + - pacman-optimize - now supports DBs on separate filesystem + - makepkg and abs now support conf files in home directory + - makepkg changes: + - arch field is required + - added -arch suffix to generated package filenames - new configuration file options format + - changed default configuration - support alternate integrity checks - extract files using filetype, not extension - added noextract array + - new options array format - new option to log build process - - new repackage option - repackage pkg/ w/o building + - new --repackage option - repackage pkg/ without building - user-selectable paths for doc stripping - configurable source cache location - dependencies now removed on a build success or failure - - pacman-optimize - support DB's on separate filesystem + - abs changes: + - supports both cvsup and csup + - expanded configuration + - added support for testing repository + - new helper scripts: + - rankmirrors - shows best available mirrors + - repo-add - adds a package to a repo database file + - repo-remove - removes a package from a repo database file + - added pactest testing suite + - MANY fixes and small inprovements everywhere 2.9.8 - Changed behaviour with original=X,current=Y,new=Z scenario - keep old in place, install new as .pacnew - Search package provides when finding matching targets with -S

3 2

Re: [pacman-dev] pacman/xdelta using XferCommand
by Dale Ogilvie 26 Mar '07

26 Mar '07

> I agree; the XferCommand solution seems like an excellent way to > prototype this and see if it is feasible. As Aaron and I have alluded > to, we aren't real big on getting this done ourselves, but we will > offer suggestions if asked. Great. I'm asking for suggestions! I have verified that my makepkg patch works to create deltas of old versions placed by the packager in the build directory. The attached patch is for 2.9.8, as this is what I'm running on my system today. 3.0 just adds some $CARCH stuff, no big deal. I have verified that the download and patch from my own custom repo works using my custom XferCommand script. See attached. Where to from here? Some have suggested using another method rather than xdelta 1.1, bdiff/zsync/xdelta3 etc. I gave zsync a try but had to give up when it failed to download the files from my tomcat web server. Possibly it would work with apache, but it wasn't a good sign. I feel that there are quite a few more moving parts to the zsync solution which weigh against it. bdiff is reportedly a better xdelta - I personally think xdelta will do until proven otherwise. Dale

1 0

[pacman-dev] makepkg3 suggestions/thoughts
by Andrew Fyfe 26 Mar '07

26 Mar '07

* Remove the '--usesudo | -S' option. Instead always use sudo to calling pacman when an unprivileged user runs makepkg and spit out a warning (or error) if sudo is missing. Is sudo part of the base Arch Linux system? * Move common functions to a seperate file. plain, msg*, error, warning, in_array, check_* This has been brought up a few times, the last time it was suggested that the file should go in /usr/lib/archlinux/functions. (I think that was it). I'll make a patch if that's where they're going to go. Alternatively an autoconf option could be added to set the folder when pacman is built. * Move --cleancache into it's own script. (Or remove altogether) It's alot of code for 'rm $SRCDEST/*'. Do people use it? * Move BUILDSCRIPT="PKGBUILD" and PKGEXT="pkg.tar.gz" into makepkg.conf. They're used in a few scripts. * sha256 sha3.. sha512 WTFs wrong with md5 and sha1? Do we REALLY need these? If they must remain I demand the inclusion of CRC :p * Remove '--nocolor | -m' option. If you don't like colour switch it off in makepkg.conf :p Is it used? Andrew

2 1

[pacman-dev] pacman/xdelta using XferCommand
by Dale Ogilvie 26 Mar '07

26 Mar '07

Hello, see my post on the forum (http://bbs.archlinux.org/viewtopic.php?pid=238317#p238317) Any chance that this "low-engineering" approach to implementing an xdelta solution could fly for arch, at least in the short term? This solution involves: 1. modified makepkg (see http://bbs.archlinux.org/viewtopic.php?pid=235654#p235654) 2. packagers having pkgver-1 in the makepkg build dir to create the delta 3. end-user implementing XferCommand with a custom xdelta aware script If this works well for some users, a full c-code solution in pacman could be rolled out further down the track. Thoughts? I see that archlinux.org and the mirrors have been experiencing some "bandwidth" issues after the python 2.5 release that perhaps underline the need for something like this in arch. Dale

2 1

[pacman-dev] new script: repo-local-cleaner
by Alessio 'mOLOk' Bolognino 25 Mar '07

25 Mar '07

Hi list, this is a script I wrote for myself, but Roman suggested me to send it here, so... here it is: it's a script that removes old packages in the local repo and optionally runs gensync at the end. I tried to follow the standards of makepkg, feel free to ignore it, change it, change its name and things like that. You can even change the copyright line and put Judd's name if you want. ---------------8<----------------8<-----------------8<-------------8< #!/bin/bash # repo-local-cleaner : delete old packages in local repo # # Copyright (c) 2007 Alessio 'mOLOk' Bolognino <themolok(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. myver='3.0.0' source /etc/makepkg.conf # for $CARCH and $USE_COLOR # default settings: PKGEXT="pkg.tar.gz" LOCAL_REPO_DIR="/home/custompkgs" LOCAL_SRCROOT="/var/abs/local" LOCAL_REPO_NAME="custom" RUN_GENSYNC="n" if [ -r /etc/repo-local-cleaner.conf ]; then source /etc/repo-local-cleaner.conf fi msg() { if [ ! "$USE_COLOR" = "n" ]; then echo -e "\033[1;32m==>\033[1;0m \033[1;1m$1\033[1;0m" >&2 else echo "==> $1" >&2 fi } error() { if [ ! "$USE_COLOR" = "n" ]; then echo -e "\033[1;31m==> ERROR:\033[1;0m \033[1;1m$1\033[1;0m" >&2 else echo "==> ERROR: $1" >&2 fi } usage() { echo "repo-local-clener $myver" echo echo "usage: repo-local-cleaner" echo echo "repo-local-clener will delete old packages from the local repository." echo "If setted in the configuration file, it can run gensync." echo "It takes no options." echo } if [ $# -ne 0 -o "$1" = "-h" -o "$1" = "--help" ]; then usage exit 0 fi cd $LOCAL_REPO_DIR count_rm=0 count_all=0 mkdir -p XXX/ for pack in $(ls -v *-${CARCH}.${PKGEXT}) ; do pkgname=${pack%-*-*-${CARCH}.${PKGEXT}} if [ "$p_pkgname" = "$pkgname" ]; then mv ${p_pack} XXX/${p_pack} let count_rm++ fi let count_all++ p_pack=${pack} p_pkgname=${pkgname} done size_removed=$(ls -sh1 XXX/ | awk '{ print $2 }' | head -1) msg "Checking for old packages..." if [ $count_rm = 0 ]; then msg "No package removed" else msg "Removed $count_rm/$count_all old package(s) ( - ${size_removed} )" fi rm -fr XXX/ if [ ! "$RUN_GENSYNC" = "n" ]; then msg "Running gensync..." gensync $LOCAL_SRCROOT $LOCAL_REPO_DIR/$LOCAL_REPO_NAME.db.tar.gz $LOCAL_REPO_DIR/ if [ $? = 0 ]; then msg "done!" else error "gensync failed :(" fi fi # vim: set ts=2 sw=2 noet: ---------------8<----------------8<-----------------8<-------------8< Cheers, -- Alessio 'mOLOk' Bolognino Arch Linux Trusted User http://www.archlinux.org

2 2

[pacman-dev] question
by fancris3 25 Mar '07

25 Mar '07

Pacman from today cvs. pacman -Suv Root : / DBPath : var/lib/pacman/ CacheDir : var/cache/pacman/pkg/ Targets : None :: Starting full system upgrade... warning: rar-3.7.b1-1: ignoring package upgrade (to be replaced by unrar-3.7.3-1) warning: bmpx: local (0.36.1-1) is newer than extra (0.34.7-1) warning: krusader: local (1.80.0-beta1) is newer than extra (1.70.1-1) warning: pacman: local (3.0.0-1) is newer than current (2.9.8-4) warning: pinot: local (0.65-1) is newer than community (0.49-1) warning: xapian-core: local (0.9.9-1) is newer than community (0.9.6-1) warning: xaralx: local (0.7r1766-2) is newer than unstable (0.7r1764-2) resolving dependencies... done. error: failed to prepare transaction (could not satisfy dependencies) :: opera-devel requires qt :: arts requires qt :: kdelibs requires qt>=3.3.7 I think missing the answer.Something like: :: failed to upgrade qt-enhanced-3.3.8-3 to qt-enhanced-3.3.8-4 I have qt-enhanced and kde from arch repository and now qt-enhanced-3.3.8-4 seem to no provide qt. Thanks

3 5

[pacman-dev] CVS update of pacman-lib (3 files)
by Dan McGee 25 Mar '07

25 Mar '07

Date: Sunday, March 25, 2007 @ 13:37:43 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: etc/pacman.d/.cvsignore (1.1 -> 1.2) pactest/tests/scriptlet001.py (1.1 -> 1.2) scripts/makepkg (1.64 -> 1.65) * Fix bug where 'makepkg -L' doesn't stop on build failure. Andrew Fyfe <andrew(a)neptune-one.net> * Add testing to etc/pacman.d/.cvsignore * Fix scriptlet001.py test to work during 'make check'. -------------------------------+ etc/pacman.d/.cvsignore | 1 + pactest/tests/scriptlet001.py | 3 ++- scripts/makepkg | 21 ++++++++------------- 3 files changed, 11 insertions(+), 14 deletions(-) Index: pacman-lib/etc/pacman.d/.cvsignore diff -u pacman-lib/etc/pacman.d/.cvsignore:1.1 pacman-lib/etc/pacman.d/.cvsignore:1.2 --- pacman-lib/etc/pacman.d/.cvsignore:1.1 Tue Jan 16 22:40:09 2007 +++ pacman-lib/etc/pacman.d/.cvsignore Sun Mar 25 13:37:42 2007 @@ -6,3 +6,4 @@ mirrorlist release unstable +testing Index: pacman-lib/pactest/tests/scriptlet001.py diff -u pacman-lib/pactest/tests/scriptlet001.py:1.1 pacman-lib/pactest/tests/scriptlet001.py:1.2 --- pacman-lib/pactest/tests/scriptlet001.py:1.1 Thu Mar 22 04:30:18 2007 +++ pacman-lib/pactest/tests/scriptlet001.py Sun Mar 25 13:37:43 2007 @@ -8,7 +8,8 @@ p1.install['post_install'] = "ls /etc"; self.addpkg(p1) -self.args = "-U %s" % p1.filename() +# --debug is necessary to check PACMAN_OUTPUT +self.args = "--debug -U %s" % p1.filename() self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_OUTPUT=pre_install") Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.64 pacman-lib/scripts/makepkg:1.65 --- pacman-lib/scripts/makepkg:1.64 Sat Mar 24 13:11:18 2007 +++ pacman-lib/scripts/makepkg Sun Mar 25 13:37:43 2007 @@ -883,6 +883,7 @@ echo $SHELLOPTS | grep errexit 2>&1 >/dev/null set_e=$? + ret=0 if [ "$LOGGING" = "1" ]; then BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log" if [ -f "$BUILDLOG" ]; then @@ -899,24 +900,18 @@ #use 'errexit' to bail on syntax error [ $set_e -eq 1 ] && set -e - build 2>&1 | tee "$BUILDLOG" + build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]} [ $set_e -eq 1 ] && set +e - - if [ ${PIPESTATUS[0]} -gt 0 ]; then - error "Build Failed. Aborting..." - removedeps - exit 2 - fi else #use 'errexit' to bail on syntax error [ $set_e -eq 1 ] && set -e - build 2>&1 + build 2>&1 || ret=$? [ $set_e -eq 1 ] && set +e - if [ $? -gt 0 ]; then - error "Build Failed. Aborting..." - removedeps - exit 2 - fi + fi + if [ $ret -gt 0 ]; then + error "Build Failed. Aborting..." + removedeps + exit 2 fi fi

1 0

[pacman-dev] [patch] makepkg3 -- makepkg doesn't stop on build failure.
by Andrew Fyfe 25 Mar '07

25 Mar '07

Hi Found a small bug. When running 'makepkg --log' makepkg doesn't stop if build() fails. Patch attached, see the header for an example. Andrew ------------------------------------------------------------ revno: 3 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: bug_log_pipe timestamp: Sun 2007-03-25 16:39:45 +0100 message: * Fix bug where 'makepkg -L' doesn't stop on build failure. To test... PKGBUILD>> pkgname=test-package pkgver=1 pkgrel=1 arch=(i686) build() { false; } run makepkg -L build() will fail and makepkg carries on trying to create the package. === modified file 'scripts/makepkg' --- old/scripts/makepkg 2007-03-24 03:49:27 +0000 +++ new/scripts/makepkg 2007-03-25 15:39:45 +0000 @@ -899,10 +899,10 @@ #use 'errexit' to bail on syntax error [ $set_e -eq 1 ] && set -e - build 2>&1 | tee "$BUILDLOG" + build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]} [ $set_e -eq 1 ] && set +e - if [ ${PIPESTATUS[0]} -gt 0 ]; then + if [ $ret -gt 0 ]; then error "Build Failed. Aborting..." removedeps exit 2

2 4

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

24 Mar '07

Date: Saturday, March 24, 2007 @ 13:11:19 Author: dan Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.63 -> 1.64) Andrew Fyfe <andrew(a)neptune-one.net> * Fix FS #6688- builddeps not working in makepkg. ---------+ makepkg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.63 pacman-lib/scripts/makepkg:1.64 --- pacman-lib/scripts/makepkg:1.63 Mon Mar 19 22:13:44 2007 +++ pacman-lib/scripts/makepkg Sat Mar 24 13:11:18 2007 @@ -252,9 +252,9 @@ if [ -f "$pkgdir/$BUILDSCRIPT" ]; then cd "$pkgdir" if [ "$RMDEPS" = "1" ]; then - makepkg -i -c -b -r -w $PKGDEST + PKGDEST="$PKGDEST" makepkg -i -c -b -r else - makepkg -i -c -b -w $PKGDEST + PKGDEST="$PKGDEST" makepkg -i -c -b fi if [ $? -eq 0 ]; then success=1

1 0

[pacman-dev] [patch] FS#6688 -- --builddeps doens't work with makepkg3
by Andrew Fyfe 24 Mar '07

24 Mar '07

Here's a patch for flyspray bug #6688. * fix flyspray bug #6688 -- --builddeps doesn't work with makepkg3 makepkg no longer supports the '-w' option, instead PKGDEST should be passed in as an enviroment variable. (ie PKGDEST=$PKGDEST pacman...) Andrew ------------------------------------------------------------ revno: 3 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: bug_6688 timestamp: Sat 2007-03-24 07:18:12 +0000 message: * fix flyspray bug #6688 -- --builddeps doesn't work with makepkg3 makepkg no longer supports the '-w' option, instead PKGDEST should be passed in as an enviroment variable. (ie PKGDEST=$PKGDEST pacman...) === modified file 'scripts/makepkg' --- old/scripts/makepkg 2007-03-24 03:49:27 +0000 +++ new/scripts/makepkg 2007-03-24 07:18:07 +0000 @@ -252,9 +252,9 @@ if [ -f "$pkgdir/$BUILDSCRIPT" ]; then cd "$pkgdir" if [ "$RMDEPS" = "1" ]; then - makepkg -i -c -b -r -w $PKGDEST + PKGDEST="$PKGDEST" makepkg -i -c -b -r else - makepkg -i -c -b -w $PKGDEST + PKGDEST="$PKGDEST" makepkg -i -c -b fi if [ $? -eq 0 ]; then success=1

1 0

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

24 Mar '07

Date: Saturday, March 24, 2007 @ 00:18:19 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: Makefile.am (1.18 -> 1.19) etc/pacman.conf.in (1.6 -> 1.7) etc/pacman.d/Makefile.am (1.7 -> 1.8) lib/libalpm/po/de.po (1.16 -> 1.17) lib/libalpm/po/en_GB.po (1.4 -> 1.5) lib/libalpm/po/fr.po (1.10 -> 1.11) lib/libalpm/po/hu.po (1.11 -> 1.12) lib/libalpm/po/it.po (1.20 -> 1.21) lib/libalpm/po/libalpm.pot (1.9 -> 1.10) lib/libalpm/po/pt_BR.po (1.10 -> 1.11) lib/libalpm/po/ru_RU.po (1.2 -> 1.3) src/pacman/po/de.po (1.19 -> 1.20) src/pacman/po/en_GB.po (1.6 -> 1.7) src/pacman/po/fr.po (1.14 -> 1.15) src/pacman/po/hu.po (1.15 -> 1.16) src/pacman/po/it.po (1.21 -> 1.22) src/pacman/po/pacman.pot (1.11 -> 1.12) src/pacman/po/pt_BR.po (1.14 -> 1.15) src/pacman/po/ru_RU.po (1.5 -> 1.6) * Added a mirror list for [testing] (it appears most mirrors mirror testing) * Commented ftp.archlinux.org in the official mirror list * ran a make dist, which updated some translation files ----------------------------+ Makefile.am | 4 etc/pacman.conf.in | 2 etc/pacman.d/Makefile.am | 2 lib/libalpm/po/de.po | 2 lib/libalpm/po/en_GB.po | 2 lib/libalpm/po/fr.po | 2 lib/libalpm/po/hu.po | 2 lib/libalpm/po/it.po | 2 lib/libalpm/po/libalpm.pot | 234 +++++++++++++++++++++---------------------- lib/libalpm/po/pt_BR.po | 2 lib/libalpm/po/ru_RU.po | 2 src/pacman/po/de.po | 48 +++++--- src/pacman/po/en_GB.po | 2 src/pacman/po/fr.po | 2 src/pacman/po/hu.po | 2 src/pacman/po/it.po | 2 src/pacman/po/pacman.pot | 206 +++++++++++++++++++------------------ src/pacman/po/pt_BR.po | 2 src/pacman/po/ru_RU.po | 2 19 files changed, 274 insertions(+), 248 deletions(-) The diff is longer than the limit of 39KB.

1 0

[pacman-dev] CVS update of pacman-lib/etc/pacman.d (mirrorlist.in)
by Dan McGee 23 Mar '07

23 Mar '07

Date: Friday, March 23, 2007 @ 13:48:05 Author: dan Path: /home/cvs-pacman/pacman-lib/etc/pacman.d Modified: mirrorlist.in (1.5 -> 1.6) * Removed three dead mirrors (Dale Blount <dale(a)archlinux.org>). ---------------+ mirrorlist.in | 5 ----- 1 file changed, 5 deletions(-) Index: pacman-lib/etc/pacman.d/mirrorlist.in diff -u pacman-lib/etc/pacman.d/mirrorlist.in:1.5 pacman-lib/etc/pacman.d/mirrorlist.in:1.6 --- pacman-lib/etc/pacman.d/mirrorlist.in:1.5 Sun Mar 18 21:28:31 2007 +++ pacman-lib/etc/pacman.d/mirrorlist.in Fri Mar 23 13:48:05 2007 @@ -65,8 +65,3 @@ # Australia Server = ftp://mirror.pacific.net.au/linux/archlinux/@@REPO@@/os/@CARCH@ -# Asia -# - China -Server = http://mirror.vxmatrix.net/ArchLinux/@@REPO@@/os/@CARCH@ -Server = http://dxmirror.vxmatrix.net/ArchLinux/@@REPO@@/os/@CARCH@ -Server = http://cncmirror.vxmatrix.net/ArchLinux/@@REPO@@/os/@CARCH@

1 0

[pacman-dev] Update for German translation
by Pierre Schmitz 23 Mar '07

23 Mar '07

Hi, i didn`t noticed that there are some new messages which have to be translated. So here is a patch; I hope not too late for the first testing-release of pacman3. Pierre

2 1

[pacman-dev] CVS update of pacman-lib (lib/libalpm/po/de.po src/pacman/po/de.po)
by Dan McGee 23 Mar '07

23 Mar '07

Date: Friday, March 23, 2007 @ 13:42:14 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/po/de.po (1.15 -> 1.16) src/pacman/po/de.po (1.18 -> 1.19) * Updated German translation Pierre Schmitz <pierre(a)archlinux.de> ----------------------+ lib/libalpm/po/de.po | 2 - src/pacman/po/de.po | 68 +++++++++++++++++-------------------------------- 2 files changed, 25 insertions(+), 45 deletions(-) Index: pacman-lib/lib/libalpm/po/de.po diff -u pacman-lib/lib/libalpm/po/de.po:1.15 pacman-lib/lib/libalpm/po/de.po:1.16 --- pacman-lib/lib/libalpm/po/de.po:1.15 Thu Mar 22 14:19:49 2007 +++ pacman-lib/lib/libalpm/po/de.po Fri Mar 23 13:42:14 2007 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" -"POT-Creation-Date: 2007-03-22 14:15-0400\n" +"POT-Creation-Date: 2007-03-23 18:01+0100\n" "PO-Revision-Date: 2007-03-07 09:12+0100\n" "Last-Translator: Pierre Schmitz <pierre(a)archlinux.de>\n" "Language-Team: Deutsch <archlinux.de>\n" Index: pacman-lib/src/pacman/po/de.po diff -u pacman-lib/src/pacman/po/de.po:1.18 pacman-lib/src/pacman/po/de.po:1.19 --- pacman-lib/src/pacman/po/de.po:1.18 Thu Mar 22 14:19:50 2007 +++ pacman-lib/src/pacman/po/de.po Fri Mar 23 13:42:14 2007 @@ -1,4 +1,4 @@ -# translation of de.po to Deutsch +# translation of de.po to German # German translations for pacman package. # Copyright (C) 2002-2007 Judd Vinet <jvinet(a)zeroflux.org> # This file is distributed under the same license as the Pacman package manager package. @@ -9,10 +9,10 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" -"POT-Creation-Date: 2007-03-22 14:16-0400\n" -"PO-Revision-Date: 2007-03-07 09:13+0100\n" +"POT-Creation-Date: 2007-03-23 18:01+0100\n" +"PO-Revision-Date: 2007-03-23 18:08+0100\n" "Last-Translator: Pierre Schmitz <pierre(a)archlinux.de>\n" -"Language-Team: Deutsch <archlinux.de>\n" +"Language-Team: German <archlinux.de>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -369,8 +369,7 @@ #: src/pacman/pacman.c:104 src/pacman/pacman.c:121 src/pacman/pacman.c:142 #, c-format msgid " -f, --force force install, overwrite conflicting files\n" -msgstr "" -" -f, --force Installation erzwingen, Dateikonflikte überschreiben\n" +msgstr " -f, --force Installation erzwingen, Dateikonflikte überschreiben\n" #: src/pacman/pacman.c:106 #, c-format @@ -379,15 +378,12 @@ #: src/pacman/pacman.c:108 #, c-format -msgid "" -" -c, --cascade remove packages and all packages that depend on them\n" -msgstr "" -" -c, --cascade Entfernt Pakete und alle, die von ihnen abhängen\n" +msgid " -c, --cascade remove packages and all packages that depend on them\n" +msgstr " -c, --cascade Entfernt Pakete und alle, die von ihnen abhängen\n" #: src/pacman/pacman.c:110 #, c-format -msgid "" -" -k, --dbonly only remove database entry, do not remove files\n" +msgid " -k, --dbonly only remove database entry, do not remove files\n" msgstr " -k, --dbonly Nur Datenbankeintrag entfernen, keine Dateien\n" #: src/pacman/pacman.c:111 @@ -397,8 +393,7 @@ #: src/pacman/pacman.c:112 #, c-format -msgid "" -" -s, --recursive remove dependencies also (that won't break packages)\n" +msgid " -s, --recursive remove dependencies also (that won't break packages)\n" msgstr "" " -s, --recursive Auch Abhängigkeiten entfernen (beschädigt keine " "Pakete)\n" @@ -454,8 +449,7 @@ #: src/pacman/pacman.c:131 #, c-format -msgid "" -" -m, --foreign list installed packages not found in sync db(s)\n" +msgid " -m, --foreign list installed packages not found in sync db(s)\n" msgstr "" " -m, --foreign Zeigt alle Pakete an, die nicht in den Sync db(s)\n" " gefunden wurden\n" @@ -477,8 +471,7 @@ msgid "" " -s, --search <regex> search locally-installed packages for matching " "strings\n" -msgstr "" -" -s, --search <regex> Durchsuche lokal installierte Pakete nach einem Wort\n" +msgstr " -s, --search <regex> Durchsuche lokal installierte Pakete nach einem Wort\n" #: src/pacman/pacman.c:135 #, c-format @@ -507,7 +500,7 @@ #: src/pacman/pacman.c:145 #, c-format msgid " -l, --list <repo> view a list of packages in a repo\n" -msgstr "" +msgstr " -l, --list <repo> Liste aller Pakete eines Repositoriums\n" #: src/pacman/pacman.c:146 #, c-format @@ -520,10 +513,8 @@ #: src/pacman/pacman.c:147 #, c-format -msgid "" -" -s, --search <regex> search remote repositories for matching strings\n" -msgstr "" -" -s, --search <regex> Durchsuche entfernte Repositorien nach einem Wort\n" +msgid " -s, --search <regex> search remote repositories for matching strings\n" +msgstr " -s, --search <regex> Durchsuche entfernte Repositorien nach einem Wort\n" #: src/pacman/pacman.c:148 #, c-format @@ -541,8 +532,7 @@ #: src/pacman/pacman.c:150 #, c-format -msgid "" -" -y, --refresh download fresh package databases from the server\n" +msgid " -y, --refresh download fresh package databases from the server\n" msgstr " -y, --refresh Lade frische Paketdatenbank vom Server\n" #: src/pacman/pacman.c:151 @@ -566,25 +556,20 @@ #: src/pacman/pacman.c:155 #, c-format -msgid "" -" --ask <number> pre-specify answers for questions (see manpage)\n" -msgstr "" -" --ask <Nummer> Antworten für Fragen vorherbestimmen (Siehe manpage)\n" +msgid " --ask <number> pre-specify answers for questions (see manpage)\n" +msgstr " --ask <Nummer> Antworten für Fragen vorherbestimmen (Siehe manpage)\n" #: src/pacman/pacman.c:156 #, c-format -msgid "" -" --noprogressbar do not show a progress bar when downloading files\n" +msgid " --noprogressbar do not show a progress bar when downloading files\n" msgstr "" " --noprogressbar Keine Fortschrittsanzeige anzeigen, wenn Dateien\n" " heruntergeladen werden\n" #: src/pacman/pacman.c:157 #, c-format -msgid "" -" --noscriptlet do not execute the install scriptlet if there is any\n" -msgstr "" -" --noscriptlet Installationskript nicht ausführen, falls vorhanden\n" +msgid " --noscriptlet do not execute the install scriptlet if there is any\n" +msgstr " --noscriptlet Installationskript nicht ausführen, falls vorhanden\n" #: src/pacman/pacman.c:158 #, c-format @@ -684,18 +669,18 @@ msgstr "Es wurde keine Datei für --owns angegeben\n" #: src/pacman/query.c:95 -#, fuzzy, c-format +#, c-format msgid "failed to read file '%s': %s" -msgstr "Konnte Paket '%s' nicht hinzufügen (%s)" +msgstr "Fehler beim Lesen der Datei '%s': %s" #: src/pacman/query.c:100 msgid "cannot determine ownership of a directory" -msgstr "" +msgstr "konnte den Besitzer eines Verzeichnisses nicht ermitteln" #: src/pacman/query.c:105 #, c-format msgid "cannot determine real path for '%s': %s" -msgstr "" +msgstr "konnte den wahren Pfad für '%s' nicht ermitteln: %s" #: src/pacman/query.c:119 #, c-format @@ -1089,8 +1074,3 @@ msgid "Total Installed Size: %.2f MB\n" msgstr "Gesamtgröße der installierten Pakete : %.2f MB\n" -#~ msgid "Installed Size : %ld K\n" -#~ msgstr "Installationsgröße : %ld K\n" - -#~ msgid "is required by" -#~ msgstr "wird benötigt von"

1 0

[pacman-dev] Typos found during localization
by Nagy Gabor 22 Mar '07

22 Mar '07

Hi! In future versions the following strings should be fixed: -my previous suggestions: http://www.archlinux.org/pipermail/pacman-dev/2007-March/002148.html -with -Qh imho '-m, --foreign list all _installed_ packages that were ...' would be better -small typo in pacman.c:145 '-l. --list ...' instead of '-l, --list ...' Bye, Nagy Gabor

2 2

[pacman-dev] CVS update of pacman-lib/lib/libalpm (add.c)
by Dan McGee 22 Mar '07

22 Mar '07

Date: Thursday, March 22, 2007 @ 14:33:27 Author: dan Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: add.c (1.129 -> 1.130) Fixed alpm_log call- too many parameters passed. (bardo on #archlinux-pacman) -------+ add.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/lib/libalpm/add.c diff -u pacman-lib/lib/libalpm/add.c:1.129 pacman-lib/lib/libalpm/add.c:1.130 --- pacman-lib/lib/libalpm/add.c:1.129 Thu Mar 22 04:28:09 2007 +++ pacman-lib/lib/libalpm/add.c Thu Mar 22 14:33:27 2007 @@ -129,7 +129,7 @@ i->data = newpkg; } else { _alpm_log(PM_LOG_WARNING, _("newer version %s-%s is in the target list -- skipping"), - pkg->name, pkg->version, pkgver); + pkg->name, pkg->version); } return(0); }

1 0

[pacman-dev] CVS update of pacman-lib (16 files)
by Dan McGee 22 Mar '07

22 Mar '07

Date: Thursday, March 22, 2007 @ 14:19:50 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/be_files.c (1.39 -> 1.40) lib/libalpm/po/de.po (1.14 -> 1.15) lib/libalpm/po/en_GB.po (1.3 -> 1.4) lib/libalpm/po/fr.po (1.9 -> 1.10) lib/libalpm/po/hu.po (1.10 -> 1.11) lib/libalpm/po/it.po (1.19 -> 1.20) lib/libalpm/po/pt_BR.po (1.9 -> 1.10) lib/libalpm/po/ru_RU.po (1.1 -> 1.2) src/pacman/pacman.c (1.109 -> 1.110) src/pacman/po/de.po (1.17 -> 1.18) src/pacman/po/en_GB.po (1.5 -> 1.6) src/pacman/po/fr.po (1.13 -> 1.14) src/pacman/po/hu.po (1.14 -> 1.15) src/pacman/po/it.po (1.20 -> 1.21) src/pacman/po/pt_BR.po (1.13 -> 1.14) src/pacman/po/ru_RU.po (1.4 -> 1.5) Clarify some English messages as suggested by Nagy Gabor. I even did the hard work of fixing these in the translation files, and I removed a few fuzzys while doing so. If any more patches for translations come, try to do it against these files. -------------------------+ lib/libalpm/be_files.c | 4 -- lib/libalpm/po/de.po | 41 ++++++++++++------------- lib/libalpm/po/en_GB.po | 32 +++++++++---------- lib/libalpm/po/fr.po | 36 ++++++++++------------ lib/libalpm/po/hu.po | 26 +++++++-------- lib/libalpm/po/it.po | 26 +++++++-------- lib/libalpm/po/pt_BR.po | 30 +++++++++--------- lib/libalpm/po/ru_RU.po | 28 ++++++++--------- src/pacman/pacman.c | 10 +++--- src/pacman/po/de.po | 29 +++++++---------- src/pacman/po/en_GB.po | 36 +++++++++------------- src/pacman/po/fr.po | 38 +++++++---------------- src/pacman/po/hu.po | 19 ++++------- src/pacman/po/it.po | 19 ++++------- src/pacman/po/pt_BR.po | 75 +++++++++++++++++++++++++++------------------- src/pacman/po/ru_RU.po | 27 ++++++---------- 16 files changed, 226 insertions(+), 250 deletions(-) The diff is longer than the limit of 39KB.

1 0

[pacman-dev] CVS update of pacman-lib/src/pacman/po (pt_BR.po)
by Dan McGee 22 Mar '07

22 Mar '07

Date: Thursday, March 22, 2007 @ 13:20:40 Author: dan Path: /home/cvs-pacman/pacman-lib/src/pacman/po Modified: pt_BR.po (1.12 -> 1.13) * Updated Brazilian Portuguese translation Douglas Soares de Andrade <dsandrade(a)gmail.com> ----------+ pt_BR.po | 84 +++++++++++++++++++++---------------------------------------- 1 file changed, 30 insertions(+), 54 deletions(-) Index: pacman-lib/src/pacman/po/pt_BR.po diff -u pacman-lib/src/pacman/po/pt_BR.po:1.12 pacman-lib/src/pacman/po/pt_BR.po:1.13 --- pacman-lib/src/pacman/po/pt_BR.po:1.12 Thu Mar 22 10:51:01 2007 +++ pacman-lib/src/pacman/po/pt_BR.po Thu Mar 22 13:20:39 2007 @@ -12,8 +12,8 @@ "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" "POT-Creation-Date: 2007-03-22 10:16-0400\n" -"PO-Revision-Date: 2007-03-07 00:17-0300\n" -"Last-Translator: Douglas Soares de Andrade <dsandrade(a)gmail.com>\n" +"PO-Revision-Date: 2007-03-22 13:52-0300\n" +"Last-Translator: Douglas Soares de Andrade <douglas(a)archlinux-br.org>\n" "Language-Team: Archlinux-br <contato(a)archlinux-br.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -382,14 +382,12 @@ #: src/pacman/pacman.c:108 #, c-format -msgid "" -" -c, --cascade remove packages and all packages that depend on them\n" +msgid " -c, --cascade remove packages and all packages that depend on them\n" msgstr " -c, --cascade remove pacotes e suas dependências\n" #: src/pacman/pacman.c:110 #, c-format -msgid "" -" -k, --dbonly only remove database entry, do not remove files\n" +msgid " -k, --dbonly only remove database entry, do not remove files\n" msgstr "" " -k, --dbonly remove apenas a entrada na base de dados, mas não " "remove os arquivos\n" @@ -401,8 +399,7 @@ #: src/pacman/pacman.c:112 #, c-format -msgid "" -" -s, --recursive remove dependencies also (that won't break packages)\n" +msgid " -s, --recursive remove dependencies also (that won't break packages)\n" msgstr "" " -s, --recursive remove também as dependências (aquelas que não vão " "quebrar outros pacotes)\n" @@ -444,8 +441,7 @@ #: src/pacman/pacman.c:128 src/pacman/pacman.c:143 #, c-format msgid " -g, --groups view all members of a package group\n" -msgstr "" -" -g, --groups visualiza todos os membros de um grupos de pacotes\n" +msgstr " -g, --groups visualiza todos os membros de um grupos de pacotes\n" #: src/pacman/pacman.c:129 src/pacman/pacman.c:144 #, c-format @@ -492,8 +488,7 @@ #: src/pacman/pacman.c:135 #, c-format msgid " -u, --upgrades list all packages that can be upgraded\n" -msgstr "" -" -u, --upgrades lista todos os pacotes que podem ser atualizados\n" +msgstr " -u, --upgrades lista todos os pacotes que podem ser atualizados\n" #: src/pacman/pacman.c:137 #, c-format @@ -515,23 +510,20 @@ msgstr " -e, --dependsonly instala apenas as dependências \n" #: src/pacman/pacman.c:145 -#, fuzzy, c-format +#, c-format msgid " -l. --list <repo> view a list of packages in a repo\n" -msgstr "" -" -g, --groups visualiza todos os membros de um grupos de pacotes\n" +msgstr " -l. --list <repo> visualizar uma lista dos pacotes em um repositório\n" #: src/pacman/pacman.c:146 #, c-format msgid "" " -p, --print-uris print out URIs for given packages and their " "dependencies\n" -msgstr "" -" -p, --print-uris imprime as URIs dos pacotes e suas dependências\n" +msgstr " -p, --print-uris imprime as URIs dos pacotes e suas dependências\n" #: src/pacman/pacman.c:147 #, c-format -msgid "" -" -s, --search search remote repositories for matching strings\n" +msgid " -s, --search search remote repositories for matching strings\n" msgstr "" " -s, --search procura em repositórios remotos por textos " "coincidentes\n" @@ -554,8 +546,7 @@ #: src/pacman/pacman.c:150 #, c-format -msgid "" -" -y, --refresh download fresh package databases from the server\n" +msgid " -y, --refresh download fresh package databases from the server\n" msgstr " -y, --refresh atualizar a base de dados de pacotes\n" #: src/pacman/pacman.c:151 @@ -570,34 +561,30 @@ #: src/pacman/pacman.c:153 #, c-format msgid " --config <path> set an alternate configuration file\n" -msgstr "" -" --config <caminho> define um arquivo de configuração alternativo\n" +msgstr " --config <caminho> define um arquivo de configuração alternativo\n" #: src/pacman/pacman.c:154 -#, fuzzy, c-format +#, c-format msgid " --noconfirm do not ask for any confirmation\n" msgstr " --noconfirm não pede nenhuma confirmação\n" #: src/pacman/pacman.c:155 #, c-format -msgid "" -" --ask <number> pre-specify answers for questions (see manpage)\n" +msgid " --ask <number> pre-specify answers for questions (see manpage)\n" msgstr "" " --ask <número> pré-especificar respostas para as perguntas (veja a " "manpage)\n" #: src/pacman/pacman.c:156 #, c-format -msgid "" -" --noprogressbar do not show a progress bar when downloading files\n" +msgid " --noprogressbar do not show a progress bar when downloading files\n" msgstr "" " --noprogressbar não mostra a barra de progresso enquanto baixa os " "arquivos\n" #: src/pacman/pacman.c:157 #, c-format -msgid "" -" --noscriptlet do not execute the install scriptlet if there is any\n" +msgid " --noscriptlet do not execute the install scriptlet if there is any\n" msgstr "" " --noscriptlet não executar o scriptlet de instalação se o mesmo " "existir\n" @@ -610,8 +597,7 @@ #: src/pacman/pacman.c:159 #, c-format msgid " -r, --root <path> set an alternate installation root\n" -msgstr "" -" -r, --root <caminho> define um diretório de instalação alternativo\n" +msgstr " -r, --root <caminho> define um diretório de instalação alternativo\n" #: src/pacman/pacman.c:160 #, c-format @@ -628,14 +614,12 @@ #: src/pacman/pacman.c:174 #, c-format msgid " This program may be freely redistributed under\n" -msgstr "" -" Este programa pode ser distribuído livremente sob\n" +msgstr " Este programa pode ser distribuído livremente sob\n" #: src/pacman/pacman.c:175 #, c-format msgid " the terms of the GNU General Public License\n" -msgstr "" -" os termos da Licença GPL - General Public License\n" +msgstr " os termos da Licença GPL - General Public License\n" #: src/pacman/pacman.c:300 #, c-format @@ -680,9 +664,8 @@ msgstr "falha ao interpretar configuração (%s)\n" #: src/pacman/pacman.c:516 -#, fuzzy msgid "Targets :" -msgstr "Pacotes:" +msgstr "Pacotes :" #: src/pacman/pacman.c:522 #, c-format @@ -702,18 +685,18 @@ msgstr "nenhum arquivo especificado para --owns\n" #: src/pacman/query.c:95 -#, fuzzy, c-format +#, c-format msgid "failed to read file '%s': %s" -msgstr "falha com o parametro'%s' (%s)" +msgstr "falha ao ler o arquivo '%s' %s" #: src/pacman/query.c:100 msgid "cannot determine ownership of a directory" -msgstr "" +msgstr "não é possível determinar o dono de um diretório" #: src/pacman/query.c:105 #, c-format msgid "cannot determine real path for '%s': %s" -msgstr "" +msgstr "não é possível determinar o caminho de '%s': %s" #: src/pacman/query.c:119 #, c-format @@ -968,7 +951,7 @@ #: src/pacman/trans.c:63 msgid "cleaning up... " -msgstr "limpando..." +msgstr "finalizando..." #: src/pacman/trans.c:66 msgid "resolving dependencies... " @@ -1019,13 +1002,12 @@ #: src/pacman/trans.c:151 #, c-format msgid ":: Retrieving packages from %s...\n" -msgstr ":: Obtendo pacotes do %s...\n" +msgstr ":: Obtendo pacotes do repositório %s...\n" #: src/pacman/trans.c:172 -#, fuzzy, c-format +#, c-format msgid ":: %1$s requires %2$s from IgnorePkg. Install %2$s? [Y/n] " -msgstr "" -":: %s requer %s, mas ele está em IgnorePkg. Instalar assim mesmo? [S/n] " +msgstr ":: %1$s requer %2$s, mas ele está em IgnorePkg. Instalar %2$s assim mesmo? [S/n] " #: src/pacman/trans.c:177 #, c-format @@ -1052,8 +1034,7 @@ #: src/pacman/trans.c:234 #, c-format msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] " -msgstr "" -":: %s-%s: a versão local é mais recente. Deseja atualizar mesmo assim? [S/n] " +msgstr ":: %s-%s: a versão local é mais recente. Deseja atualizar mesmo assim? [S/n] " #: src/pacman/trans.c:252 #, c-format @@ -1115,8 +1096,3 @@ msgid "Total Installed Size: %.2f MB\n" msgstr "Tamanho total da instalação: %.2f MB\n" -#~ msgid "Installed Size : %ld K\n" -#~ msgstr "Espaço Utilizado : %ld K\n" - -#~ msgid "is required by" -#~ msgstr "é requerido por"

1 0