- Pacman-dev - lists.archlinux.org

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

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

14 Feb '07

Date: Wednesday, February 14, 2007 @ 10:54:36 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/util.c (1.45 -> 1.46) lib/libalpm/util.h (1.21 -> 1.22) src/pacman/package.c (1.29 -> 1.30) src/pacman/trans.c (1.33 -> 1.34) * strlen -> mbstowcs (multibyte str to wide char str) conversion where we want the actual number of characters, not the number of bytes. * Added a TODO to take care of later in scriptlet processing. ----------------------+ lib/libalpm/util.c | 18 +++++++++++++----- lib/libalpm/util.h | 1 + src/pacman/package.c | 4 ++-- src/pacman/trans.c | 2 +- 4 files changed, 17 insertions(+), 8 deletions(-) Index: pacman-lib/lib/libalpm/util.c diff -u pacman-lib/lib/libalpm/util.c:1.45 pacman-lib/lib/libalpm/util.c:1.46 --- pacman-lib/lib/libalpm/util.c:1.45 Tue Feb 13 03:15:38 2007 +++ pacman-lib/lib/libalpm/util.c Wed Feb 14 10:54:35 2007 @@ -509,12 +509,19 @@ char line[1024]; if(fgets(line, 1024, pp) == NULL) break; + /*TODO clean this code up, remove weird SCRIPTLET_START/DONE, + * (void*)atol call, etc. */ /* "START <event desc>" */ - if((strlen(line) > strlen(SCRIPTLET_START)) && !strncmp(line, SCRIPTLET_START, strlen(SCRIPTLET_START))) { - EVENT(trans, PM_TRANS_EVT_SCRIPTLET_START, _alpm_strtrim(line + strlen(SCRIPTLET_START)), NULL); + if((strlen(line) > strlen(SCRIPTLET_START)) + && !strncmp(line, SCRIPTLET_START, strlen(SCRIPTLET_START))) { + EVENT(trans, PM_TRANS_EVT_SCRIPTLET_START, + _alpm_strtrim(line + strlen(SCRIPTLET_START)), NULL); /* "DONE <ret code>" */ - } else if((strlen(line) > strlen(SCRIPTLET_DONE)) && !strncmp(line, SCRIPTLET_DONE, strlen(SCRIPTLET_DONE))) { - EVENT(trans, PM_TRANS_EVT_SCRIPTLET_DONE, (void*)atol(_alpm_strtrim(line + strlen(SCRIPTLET_DONE))), NULL); + } else if((strlen(line) > strlen(SCRIPTLET_DONE)) + && !strncmp(line, SCRIPTLET_DONE, strlen(SCRIPTLET_DONE))) { + EVENT(trans, PM_TRANS_EVT_SCRIPTLET_DONE, + (void*)atol(_alpm_strtrim(line + strlen(SCRIPTLET_DONE))), + NULL); } else { _alpm_strtrim(line); /* log our script output */ @@ -526,7 +533,8 @@ exit(0); } else { if(waitpid(pid, 0, 0) == -1) { - _alpm_log(PM_LOG_ERROR, _("call to waitpid failed (%s)"), strerror(errno)); + _alpm_log(PM_LOG_ERROR, _("call to waitpid failed (%s)"), + strerror(errno)); retval = 1; goto cleanup; } Index: pacman-lib/lib/libalpm/util.h diff -u pacman-lib/lib/libalpm/util.h:1.21 pacman-lib/lib/libalpm/util.h:1.22 --- pacman-lib/lib/libalpm/util.h:1.21 Tue Feb 13 03:15:38 2007 +++ pacman-lib/lib/libalpm/util.h Wed Feb 14 10:54:35 2007 @@ -51,6 +51,7 @@ #define _(s) s #endif +/*TODO wtf? why is this done like this? */ #define SCRIPTLET_START "START " #define SCRIPTLET_DONE "DONE " Index: pacman-lib/src/pacman/package.c diff -u pacman-lib/src/pacman/package.c:1.29 pacman-lib/src/pacman/package.c:1.30 --- pacman-lib/src/pacman/package.c:1.29 Mon Feb 12 10:39:29 2007 +++ pacman-lib/src/pacman/package.c Wed Feb 14 10:54:35 2007 @@ -94,7 +94,7 @@ /* printed using a variable to make i18n safe */ printf("%s", descheader); - indentprint(alpm_pkg_get_desc(pkg), strlen(descheader)); + indentprint(alpm_pkg_get_desc(pkg), mbstowcs(NULL, descheader, 0)); printf("\n"); /* Print additional package info if info flag passed more than once */ @@ -134,7 +134,7 @@ /* printed using a variable to make i18n safe */ printf("%s", descheader); - indentprint(alpm_pkg_get_desc(pkg), strlen(descheader)); + indentprint(alpm_pkg_get_desc(pkg), mbstowcs(NULL, descheader, 0)); printf("\n"); if (md5sum != NULL && md5sum[0] != '\0') { Index: pacman-lib/src/pacman/trans.c diff -u pacman-lib/src/pacman/trans.c:1.33 pacman-lib/src/pacman/trans.c:1.34 --- pacman-lib/src/pacman/trans.c:1.33 Fri Feb 9 11:02:01 2007 +++ pacman-lib/src/pacman/trans.c Wed Feb 14 10:54:35 2007 @@ -334,7 +334,7 @@ /* determine room left for non-digits text [not ( 1/12) part] */ textlen = infolen - 3 - (2 * digits); /* room left for package name */ - pkglen = textlen - strlen(ptr) - 1; + pkglen = textlen - mbstowcs(NULL, ptr, 0) - 1; switch (event) { case PM_TRANS_PROGRESS_ADD_START:

1 0

Re: [pacman-dev] pt BR translation
by Dan McGee 14 Feb '07

14 Feb '07

On 2/13/07, Douglas Soares de Andrade <dsandrade(a)gmail.com> wrote: > > Hi guys, > > We at archlinux-br are proud to send our work. Here is our translation :) > Thanks a lot, it is now checked in to CVS, so future builds will include it. If you guys want to, it may also be good to translate the file located in lib/libalpm/po/ for your language as well, although these messages show up a lot less frequently. -Dan

2 2

[pacman-dev] CVS update of pacman-lib/src/pacman/po (pt_BR.po)
by dan＠archlinux.org 14 Feb '07

14 Feb '07

Date: Wednesday, February 14, 2007 @ 10:14:42 Author: dan Path: /home/cvs-pacman/pacman-lib/src/pacman/po Modified: pt_BR.po (1.3 -> 1.4) * pt_BR translation updates. ----------+ pt_BR.po | 115 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 57 insertions(+), 58 deletions(-) Index: pacman-lib/src/pacman/po/pt_BR.po diff -u pacman-lib/src/pacman/po/pt_BR.po:1.3 pacman-lib/src/pacman/po/pt_BR.po:1.4 --- pacman-lib/src/pacman/po/pt_BR.po:1.3 Tue Feb 13 21:54:30 2007 +++ pacman-lib/src/pacman/po/pt_BR.po Wed Feb 14 10:14:42 2007 @@ -12,7 +12,7 @@ "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" "POT-Creation-Date: 2007-02-12 10:17-0500\n" -"PO-Revision-Date: 2007-02-14 00:33-0200\n" +"PO-Revision-Date: 2007-02-14 08:58-0200\n" "Last-Translator: Douglas Soares de Andrade <dsandrade(a)gmail.com>\n" "Language-Team: Português do Brasil <pt(a)li.org>\n" "MIME-Version: 1.0\n" @@ -38,14 +38,14 @@ #: src/pacman/add.c:80 #, c-format msgid "failed to add target '%s' (%s)" -msgstr "falha ao adicionar objeto '%s' (%s)" +msgstr "falha com o parametro'%s' (%s)" #: src/pacman/add.c:85 src/pacman/sync.c:194 src/pacman/trans.c:70 #: src/pacman/trans.c:77 src/pacman/trans.c:81 src/pacman/trans.c:91 #: src/pacman/trans.c:105 src/pacman/trans.c:119 src/pacman/trans.c:131 #: src/pacman/trans.c:142 msgid "done.\n" -msgstr "feito.\n" +msgstr "concluído.\n" #: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:572 #, c-format @@ -65,7 +65,7 @@ #: src/pacman/add.c:127 src/pacman/sync.c:665 #, c-format msgid "%s%s exists in \"%s\" (target) and \"%s\" (target)\n" -msgstr "%s%s existe em \"%s\" (destino) and \"%s\" (destino)\n" +msgstr "%s%s existe em \"%s\" (pacote) e em \"%s\" (pacote)\n" #: src/pacman/add.c:134 src/pacman/sync.c:672 #, c-format @@ -103,12 +103,12 @@ #: src/pacman/deptest.c:81 #, c-format msgid "add target %s\n" -msgstr "adicionar objeto %s\n" +msgstr "adicionar pacote %s\n" #: src/pacman/deptest.c:84 #, c-format msgid "could not add target (%s)\n" -msgstr "não foi possível adicionar destino (%s)\n" +msgstr "não foi possível adicionar o pacote (%s)\n" #: src/pacman/deptest.c:103 #, c-format @@ -392,12 +392,12 @@ #: src/pacman/pacman.c:138 #, c-format msgid " -d, --nodeps skip dependency checks\n" -msgstr "-d, --nodeps ignora a verificação de dependências\n" +msgstr " -d, --nodeps ignora a verificação de dependências\n" #: src/pacman/pacman.c:102 src/pacman/pacman.c:119 src/pacman/pacman.c:140 #, c-format msgid " -f, --force force install, overwrite conflicting files\n" -msgstr " -f, --force forçar instalação, sobrescrever arquivos conflitantes\n" +msgstr " -f, --force forçar instalação, sobrescrever arquivos conflitantes\n" #: src/pacman/pacman.c:104 #, c-format @@ -407,26 +407,26 @@ #: src/pacman/pacman.c:106 #, c-format msgid " -c, --cascade remove packages and all packages that depend on them\n" -msgstr " -c, --cascade remove pacotes e todos os pacotes que dependem deles\n" +msgstr " -c, --cascade remove pacotes e suas dependências\n" #: src/pacman/pacman.c:108 #, c-format 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 " +" -k, --dbonly remove apenas a entrada na base de dados, mas não " "remove os arquivos\n" #: src/pacman/pacman.c:109 #, c-format msgid " -n, --nosave remove configuration files as well\n" -msgstr " -n, --nosave remove os arquivos de configuração também\n" +msgstr " -n, --nosave remove os arquivos de configuração\n" #: src/pacman/pacman.c:110 #, c-format msgid " -s, --recursive remove dependencies also (that won't break packages)\n" msgstr "" -" -s, --recursive remove, também, as dependências (isso não quebrará os " -"pacotes)\n" +" -s, --recursive remove também as dependências (aquelas que não vão\n" +" quebrar outros pacotes)\n" #: src/pacman/pacman.c:113 #, c-format @@ -446,34 +446,35 @@ #: src/pacman/pacman.c:123 #, c-format msgid " -c, --changelog view the changelog of a package\n" -msgstr " -c, --changelog visualiza o changelog de um pacote\n" +msgstr " -c, --changelog visualiza o changelog de um pacote\n" #: src/pacman/pacman.c:124 #, c-format msgid "" " -e, --orphans list all packages installed as dependencies but no " "longer\n" -msgstr "-e, --orphans lista todos os pacotes instalados como dependências, mas que não são mais usados\n" +msgstr "" +" -e, --orphans lista todos os pacotes instalados como dependências,\n" #: src/pacman/pacman.c:125 #, c-format msgid " required by any package\n" -msgstr " requerido por qualquer pacote\n" +msgstr " mas que não são mais requeridos por outros pacotes\n" #: src/pacman/pacman.c:126 src/pacman/pacman.c:141 #, 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:127 src/pacman/pacman.c:142 #, c-format msgid " -i, --info view package information\n" -msgstr "-i, --info visualiza informações do pacote\n" +msgstr " -i, --info visualiza informações do pacote\n" #: src/pacman/pacman.c:128 #, c-format msgid " -l, --list list the contents of the queried package\n" -msgstr " -l, --list lista o conteúdo do pacote pesquisado\n" +msgstr " -l, --list lista o conteúdo do pacote pesquisado\n" #: src/pacman/pacman.c:129 #, c-format @@ -481,13 +482,13 @@ " -m, --foreign list all packages that were not found in the sync db" "(s)\n" msgstr "" -" -m, --foreign lista todos os pacotes que não foram encontrados na(s)" -"base(s) de dados sincronizada\n" +" -m, --foreign lista todos os pacotes que não foram encontrados\n" +" na(s) base(s) de dados de pacotes\n" #: src/pacman/pacman.c:130 #, c-format msgid " -o, --owns <file> query the package that owns <file>\n" -msgstr " -o, --owns <arquivo> pesquisa o pacote que contém <arquivo>\n" +msgstr " -o, --owns <arquivo> pesquisa o pacote que contém <arquivo>\n" #: src/pacman/pacman.c:131 #, c-format @@ -495,7 +496,7 @@ " -p, --file query the package file [package] instead of the " "database\n" msgstr "" -" -p, --file pesquisa o arquivo de pacote [pacote] ao invés da base " +" -p, --file pesquisa o arquivo de pacote [pacote] ao invés da base " "de dados\n" #: src/pacman/pacman.c:132 @@ -504,13 +505,13 @@ " -s, --search search locally-installed packages for matching " "strings\n" msgstr "" -" -s, --search busca em arquivos localmente instalados por textos " +" -s, --search busca em arquivos localmente instalados por textos " "coincidentes\n" #: src/pacman/pacman.c:133 #, 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:135 #, c-format @@ -523,46 +524,44 @@ " -c, --clean remove old packages from cache directory (use -cc for " "all)\n" msgstr "" -" -c, --clean remove pacotes antigos do diretório de cache (use -cc " -"para remover todos os pacotes que estão em cache)\n" +" -c, --clean remove pacotes antigos do diretório de cache (use -cc\n" +" para remover todos os pacotes)\n" #: src/pacman/pacman.c:139 #, c-format msgid " -e, --dependsonly install dependencies only\n" -msgstr " -e, --dependsonly instala apenas as dependências \n" +msgstr " -e, --dependsonly instala apenas as dependências \n" #: src/pacman/pacman.c:143 #, 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 de suas dependências\n" +msgstr " -p, --print-uris imprime as URIs dos pacotes e suas dependências\n" #: src/pacman/pacman.c:144 #, c-format msgid " -s, --search search remote repositories for matching strings\n" msgstr "" -" -s, --search procura em repositórios remotos por textos " +" -s, --search procura em repositórios remotos por textos " "coincidentes\n" #: src/pacman/pacman.c:145 #, c-format msgid " -u, --sysupgrade upgrade all packages that are out of date\n" -msgstr " -u, --sysupgrade atualiza todos os pacotes que estão desatualizados\n" +msgstr " -u, --sysupgrade atualiza todos os pacotes que estão desatualizados no sistema\n" #: src/pacman/pacman.c:146 #, c-format msgid "" " -w, --downloadonly download packages but do not install/upgrade " "anything\n" -msgstr " -w, --downloadonly baixa os pacotes mas não instala/atualiza nenhum pacote\n" +msgstr " -w, --downloadonly baixa os pacotes mas não instala/atualiza nenhum pacote\n" #: src/pacman/pacman.c:147 #, c-format msgid " -y, --refresh download fresh package databases from the server\n" -msgstr "" -" -y, --refresh baixar bases de dados de pacotes atualizadas do " -"servidor\n" +msgstr " -y, --refresh atualizar a base de dados de pacotes\n" #: src/pacman/pacman.c:148 #, c-format @@ -570,7 +569,7 @@ " --ignore <pkg> ignore a package upgrade (can be used more than " "once)\n" msgstr "" -" --ignore <pkg> ignora a atualização de um pacote (pode ser usado mais " +" --ignore <pkg> ignora a atualização de um pacote (pode ser usado mais " "de uma vez)\n" #: src/pacman/pacman.c:150 @@ -581,48 +580,48 @@ #: src/pacman/pacman.c:151 #, c-format msgid " --noconfirm do not ask for anything confirmation\n" -msgstr " --noconfirm não pede nenhuma confirmação\n" +msgstr " --noconfirm não pede nenhuma confirmação\n" #: src/pacman/pacman.c:152 #, c-format msgid " --ask <number> pre-specify answers for questions (see manpage)\n" msgstr "" -" --ask <número> pré-especificar respostas para as perguntas (veja o " +" --ask <número> pré-especificar respostas para as perguntas (veja a " "manpage)\n" #: src/pacman/pacman.c:153 #, c-format msgid " --noprogressbar do not show a progress bar when downloading files\n" msgstr "" -" --noprogressbar não mostra uma barra de progresso enquanto baixa os " +" --noprogressbar não mostra a barra de progresso enquanto baixa os " "arquivos\n" #: src/pacman/pacman.c:154 #, c-format 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 " +" --noscriptlet não executar o scriptlet de instalação se o mesmo " "existir\n" #: src/pacman/pacman.c:155 #, c-format msgid " -v, --verbose be verbose\n" -msgstr " -v, --verbose informações adicionais\n" +msgstr " -v, --verbose informações adicionais\n" #: src/pacman/pacman.c:156 #, 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:157 #, c-format msgid " -b, --dbpath <path> set an alternate database location\n" -msgstr " -b, --dbpath <caminho> define uma localização diferente da base de dados\n" +msgstr " -b, --dbpath <caminho> define uma localização diferente para a base de dados\n" #: src/pacman/pacman.c:158 #, c-format msgid " --cachedir <dir> set an alternate database location\n" -msgstr " --cachedir <caminho> define uma localização diferente da base de dados\n" +msgstr " --cachedir <diretório> define um diretório de cache alternativo\n" #: src/pacman/pacman.c:171 #, c-format @@ -632,7 +631,7 @@ #: src/pacman/pacman.c:172 #, c-format msgid " the terms of the GNU General Public License\n" -msgstr " os termos da Licensa Pública Geral GPL\n" +msgstr " os termos da Licença GPL - General Public License\n" #: src/pacman/pacman.c:299 #, c-format @@ -674,7 +673,7 @@ #: src/pacman/pacman.c:520 src/pacman/remove.c:125 src/pacman/util.c:323 msgid "Targets:" -msgstr "Alvos:" +msgstr "Pacotes:" #: src/pacman/pacman.c:526 #, c-format @@ -683,7 +682,7 @@ #: src/pacman/pacman.c:533 msgid "no targets specified (use -h for help)\n" -msgstr "nenhum objeto definido (use -h para obter ajuda)\n" +msgstr "nenhum arquivo definido (use -h para obter ajuda)\n" #: src/pacman/pacman.c:546 msgid "no operation specified (use -h for help)\n" @@ -709,7 +708,7 @@ #: src/pacman/query.c:125 msgid "Checking for package upgrades..." -msgstr "Buscando atualizações de pacotes" +msgstr "Buscando atualizações de pacotes..." #: src/pacman/query.c:132 msgid "no upgrades found" @@ -722,12 +721,12 @@ #: src/pacman/query.c:181 msgid "no package file was specified for --file\n" -msgstr "nenhum arquivo de pacote foi especificado para o --file\n" +msgstr "nenhum pacote foi especificado para a opção --file\n" #: src/pacman/query.c:185 #, c-format msgid "failed to load package '%s' (%s)\n" -msgstr "falha ao carregar pacote '%s' (%s)\n" +msgstr "falha ao carregar o pacote '%s' (%s)\n" #: src/pacman/query.c:223 src/pacman/query.c:255 #, c-format @@ -756,7 +755,7 @@ #: src/pacman/remove.c:89 #, c-format msgid "failed to add target '%s' (%s)\n" -msgstr "falha ao adicionar objeto '%s' (%s)\n" +msgstr "falha com o parametro '%s' (%s)\n" #: src/pacman/remove.c:103 #, c-format @@ -826,7 +825,7 @@ #: src/pacman/sync.c:446 msgid ":: Synchronizing package databases...\n" -msgstr ":: Sincronizando o banco de dados de pacotes...\n" +msgstr ":: Sincronizando a base de dados de pacotes...\n" #: src/pacman/sync.c:447 msgid "synchronizing package lists" @@ -838,7 +837,7 @@ #: src/pacman/sync.c:455 msgid ":: Starting full system upgrade...\n" -msgstr ":: Iniciando atualização de todo o sistema...\n" +msgstr ":: Iniciando atualização do sistema...\n" #: src/pacman/sync.c:456 msgid "starting full system upgrade" @@ -888,7 +887,7 @@ #: src/pacman/sync.c:559 #, c-format msgid "'%s': not found in sync db\n" -msgstr "'%s': não encontrado no banco de dados sincronizado\n" +msgstr "'%s': não foi encontrado na base de dados de pacotes\n" #: src/pacman/sync.c:579 msgid "requires" @@ -900,7 +899,7 @@ #: src/pacman/sync.c:621 msgid "local database is up to date\n" -msgstr "banco de dados de pacotes está atualizado\n" +msgstr "base de dados de pacotes local está atualizada\n" #: src/pacman/sync.c:630 msgid "" @@ -924,7 +923,7 @@ #: src/pacman/sync.c:646 msgid "Proceed with installation? [Y/n] " -msgstr "Continuar com a instalação? [Y/n] " +msgstr "Continuar a instalação? [Y/n] " #: src/pacman/trans.c:52 msgid "checking dependencies... " @@ -1058,7 +1057,7 @@ "Total Removed Size: %.2f MB\n" msgstr "" "\n" -"Tamanho Total Removido: %.2f MB\n" +"Tamanho total dos pacotes a serem removidos: %.2f MB\n" #: src/pacman/util.c:329 #, c-format @@ -1067,7 +1066,7 @@ "Total Package Size: %.2f MB\n" msgstr "" "\n" -"Tamanho Total do Pacote: %.2f MB\n" +"Tamanho total dos pacotes a serem baixados: %.2f MB\n" #: src/pacman/util.c:336 #, c-format

1 0

[pacman-dev] CVS update of pacman-lib/doc (makepkg.8)
by dan＠archlinux.org 14 Feb '07

14 Feb '07

Date: Wednesday, February 14, 2007 @ 10:06:03 Author: dan Path: /home/cvs-pacman/pacman-lib/doc Modified: makepkg.8 (1.5 -> 1.6) * Updated makepkg.8 manpage to reflect shift of -S to --usesudo. -----------+ makepkg.8 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) Index: pacman-lib/doc/makepkg.8 diff -u pacman-lib/doc/makepkg.8:1.5 pacman-lib/doc/makepkg.8:1.6 --- pacman-lib/doc/makepkg.8:1.5 Thu Feb 8 22:44:54 2007 +++ pacman-lib/doc/makepkg.8 Wed Feb 14 10:06:03 2007 @@ -101,10 +101,11 @@ run-time dependencies are found, \fBpacman\fP will try to resolve them. If successful, the missing packages will be downloaded and installed. .TP -.B \-S, --sudosync -Install missing dependencies using \fBpacman\fP and \fBsudo\fP. This is the -same as \fB-s\fP except that \fBsudo\fP is used, meaning you do not have to -build as root to use dependency auto-resolution. +.B \-S, --usesudo +Use \fBsudo\fP to perform all operations that require \fBpacman\fP. This is +useful for \fB--install\fP, \fB--rmdeps\fP, and \fB--syncdeps\fP. If you are +building packages as a non-root user as recommended, this option should be used +if using any option that calls \fBpacman\fP. .TP .B \--noconfirm (Passed to \fBpacman\fP) Prevent \fBpacman\fP from waiting for user input

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (conflict.c)
by dan＠archlinux.org 14 Feb '07

14 Feb '07

Date: Tuesday, February 13, 2007 @ 21:58:36 Author: dan Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: conflict.c (1.35 -> 1.36) Slightly optimized to remove duplicate strcmp operation. ------------+ conflict.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) Index: pacman-lib/lib/libalpm/conflict.c diff -u pacman-lib/lib/libalpm/conflict.c:1.35 pacman-lib/lib/libalpm/conflict.c:1.36 --- pacman-lib/lib/libalpm/conflict.c:1.35 Tue Feb 13 03:15:38 2007 +++ pacman-lib/lib/libalpm/conflict.c Tue Feb 13 21:58:35 2007 @@ -220,18 +220,25 @@ while(pA && pB) { const char *strA = pA->data; const char *strB = pB->data; + /* skip directories, we don't care about dir conflicts */ if(strA[strlen(strA)-1] == '/') { pA = pA->next; } else if(strB[strlen(strB)-1] == '/') { pB = pB->next; - } else if(strcmp(strA, strB) == -1) { - pA = pA->next; - } else if(strcmp(strB, strA) == -1) { - pB = pB->next; } else { - ret = alpm_list_add(ret, strdup(strA)); - pA = pA->next; - pB = pB->next; + int cmp = strcmp(strA, strB); + if(cmp < 0) { + /* item only in filesA, ignore it */ + pA = pA->next; + } else if(cmp > 0) { + /* item only in filesB, ignore it */ + pB = pB->next; + } else { + /* item in both, record it */ + ret = alpm_list_add(ret, strdup(strA)); + pA = pA->next; + pB = pB->next; + } } } for(alpm_list_t *i = ret; i; i = i->next) {

2 1

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by Aaron Griffin 14 Feb '07

14 Feb '07

Date: Wednesday, February 14, 2007 @ 00:52:49 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.49 -> 1.50) While trying to change the number of missing deps output by makepkg, I noticed some needless complication in a few of these functions (checkdeps required stderr output due to the way it was called/used) so that's all cleaned up now. Also, makepkg no longer outputs a single dep when they are missing, it lists all at once, including makedeps ---------+ makepkg | 81 +++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 44 insertions(+), 37 deletions(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.49 pacman-lib/scripts/makepkg:1.50 --- pacman-lib/scripts/makepkg:1.49 Tue Feb 13 15:47:34 2007 +++ pacman-lib/scripts/makepkg Wed Feb 14 00:52:49 2007 @@ -182,32 +182,15 @@ [ $# -gt 0 ] || return - missdep=$(pacman $PACMAN_OPTS -T $*) + pmout=$(pacman $PACMAN_OPTS -T $*) ret=$? - if [ "$ret" != "0" ]; then - if [ "$ret" = "127" ]; then - msg "Missing Dependencies:" - msg "" - nl=0 - for dep in $missdep; do - echo -ne "$dep " >&2 - if [ "$nl" = "1" ]; then - nl=0 - echo -ne "\n" >&2 - # add this dep to the list - depname=$(echo $dep | sed 's|=.*$||' | sed 's|>.*$||' | sed 's|<.*$||') - deplist="$deplist $depname" - continue - fi - nl=1 - done - msg "" - else - error "pacman returned a fatal error." - exit 1 - fi + if [ $ret -eq 127 ]; then #unresolved deps + #strip out the pacman prefix from "requires: xyz" + echo $pmout | sed 's|requires:||g' + elif [ $ret -ne 0 ]; then + error "pacman returned a fatal error ($ret): $pmout" + exit 1 fi - echo $deplist } handledeps() { @@ -302,6 +285,30 @@ return $missingdeps } +resolvedeps() { + deplist=$(checkdeps $*) + if [ -n "${deplist}" ]; then + handledeps $deplist + if [ $? -eq 0 ]; then + # check deps again to make sure they were resolved + deplist=$(checkdeps ${depends[@]}) + if [ -n "${deplist}" ]; then + error "Failed to install missing dependencies." + fi + fi + fi + + if [ -n "${deplist}" ]; then + msg "Missing Dependencies:" + for dep in ${deplist}; do + msg2 "${dep}" + done + return 1 + else + return 0 + fi +} + # fix flyspray bug #5923 removedeps() { if [ "$RMDEPS" = "1" -a "$SUDO" = "1" -a $ ! -z "$deplist" -o ! -z "$makedeplist" $ ]; then @@ -591,22 +598,22 @@ fi # skip printing a warning message for the others: geninteg, nobuild, repkg elif [ $(type -p pacman) ]; then + deperr=0 + msg "Checking Runtime Dependencies..." - deplist=$(checkdeps ${depends[@]}) - handledeps $deplist - if [ $? -gt 0 ]; then - exit 1 - fi - # check deps again to make sure they were resolved - deplist=$(checkdeps ${depends[@]}) - if [ ! -z "$deplist" ]; then - error "Failed to install missing dependencies." - exit 1 + resolvedeps ${depends[@]} + if [ $? -ne 0 ]; then + deperr=1 fi + msg "Checking Buildtime Dependencies..." - makedeplist=$(checkdeps ${makedepends[@]}) - handledeps $makedeplist - if [ $? -gt 0 ]; then + resolvedeps ${makedepends[@]} + if [ $? -ne 0 ]; then + deperr=1 + fi + + if [ $deperr -eq 1 ]; then + error "could not resolve all dependencies." exit 1 fi else

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (add.c alpm.c)
by dan＠archlinux.org 14 Feb '07

14 Feb '07

Date: Wednesday, February 14, 2007 @ 00:34:21 Author: dan Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: add.c (1.113 -> 1.114) alpm.c (1.118 -> 1.119) * Removed needless checking of package infolevel- leave it to the alpm_pkg_get functions to do this. --------+ add.c | 11 ++--------- alpm.c | 22 ++++++---------------- 2 files changed, 8 insertions(+), 25 deletions(-) Index: pacman-lib/lib/libalpm/add.c diff -u pacman-lib/lib/libalpm/add.c:1.113 pacman-lib/lib/libalpm/add.c:1.114 --- pacman-lib/lib/libalpm/add.c:1.113 Sat Feb 10 18:44:39 2007 +++ pacman-lib/lib/libalpm/add.c Wed Feb 14 00:34:21 2007 @@ -400,20 +400,13 @@ /* we'll need to save some record for backup checks later */ oldpkg = _alpm_pkg_new(local->name, local->version); if(oldpkg) { - if(!(local->infolevel & INFRQ_FILES)) { - _alpm_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), local->name); - _alpm_db_read(db, INFRQ_FILES, local); - } - oldpkg->backup = alpm_list_strdup(local->backup); + oldpkg->backup = alpm_list_strdup(alpm_pkg_get_backup(local)); strncpy(oldpkg->name, local->name, PKG_NAME_LEN); strncpy(oldpkg->version, local->version, PKG_VERSION_LEN); } /* copy over the install reason */ - if(!(local->infolevel & INFRQ_DESC)) { - _alpm_db_read(db, INFRQ_DESC, local); - } - info->reason = local->reason; + info->reason = alpm_pkg_get_reason(local); /* pre_upgrade scriptlet */ if(info->scriptlet && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { Index: pacman-lib/lib/libalpm/alpm.c diff -u pacman-lib/lib/libalpm/alpm.c:1.118 pacman-lib/lib/libalpm/alpm.c:1.119 --- pacman-lib/lib/libalpm/alpm.c:1.118 Mon Feb 12 20:46:33 2007 +++ pacman-lib/lib/libalpm/alpm.c Wed Feb 14 00:34:21 2007 @@ -476,18 +476,13 @@ sha1sum = _alpm_SHAFile(path); if(sha1sum == NULL) { - _alpm_log(PM_LOG_ERROR, _("could not get sha1 checksum for package %s-%s"), + _alpm_log(PM_LOG_ERROR, _("could not get sha1sum for package %s-%s"), pkg->name, pkg->version); pm_errno = PM_ERR_NOT_A_FILE; retval = -1; } else { - if(!(pkg->infolevel & INFRQ_DESC)) { - _alpm_log(PM_LOG_DEBUG, _("loading DESC info for '%s'"), pkg->name); - _alpm_db_read(pkg->data, INFRQ_DESC, pkg); - } - - if(strcmp(sha1sum, pkg->sha1sum) == 0) { - _alpm_log(PM_LOG_DEBUG, _("checksums for package %s-%s are matching"), + if(strcmp(sha1sum, alpm_pkg_get_sha1sum(pkg)) == 0) { + _alpm_log(PM_LOG_DEBUG, _("sha1sums for package %s-%s match"), pkg->name, pkg->version); } else { _alpm_log(PM_LOG_ERROR, _("sha1sums do not match for package %s-%s"), @@ -525,18 +520,13 @@ md5sum = _alpm_MDFile(path); if(md5sum == NULL) { - _alpm_log(PM_LOG_ERROR, _("could not get md5 checksum for package %s-%s"), + _alpm_log(PM_LOG_ERROR, _("could not get md5sum for package %s-%s"), pkg->name, pkg->version); pm_errno = PM_ERR_NOT_A_FILE; retval = -1; } else { - if(!(pkg->infolevel & INFRQ_DESC)) { - _alpm_log(PM_LOG_DEBUG, _("loading DESC info for '%s'"), pkg->name); - _alpm_db_read(pkg->data, INFRQ_DESC, pkg); - } - - if(strcmp(md5sum, pkg->md5sum) == 0) { - _alpm_log(PM_LOG_DEBUG, _("checksums for package %s-%s are matching"), + if(strcmp(md5sum, alpm_pkg_get_md5sum(pkg)) == 0) { + _alpm_log(PM_LOG_DEBUG, _("md5sums for package %s-%s match"), pkg->name, pkg->version); } else { _alpm_log(PM_LOG_ERROR, _("md5sums do not match for package %s-%s"),

1 0

[pacman-dev] CVS update of pacman-lib (TODO.aaron)
by Aaron Griffin 14 Feb '07

14 Feb '07

Date: Tuesday, February 13, 2007 @ 23:58:37 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: TODO.aaron (1.16 -> 1.17) TODO update ------------+ TODO.aaron | 2 -- 1 file changed, 2 deletions(-) Index: pacman-lib/TODO.aaron diff -u pacman-lib/TODO.aaron:1.16 pacman-lib/TODO.aaron:1.17 --- pacman-lib/TODO.aaron:1.16 Wed Feb 7 15:22:36 2007 +++ pacman-lib/TODO.aaron Tue Feb 13 23:58:37 2007 @@ -8,8 +8,6 @@ - monotone and mercurial look like the top contenders in my book, but I need to evaluate both a bit more. -* Make sure all the alpm_list_t changes are valid (especially alpm_list_free) - * src/pacman: - There's quite a few single function headers which contain the pacman_* functions. We should move these to a single header (pacman.h) to clean up

1 0