- Pacman-dev - lists.archlinux.org

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

12 Mar '07

Date: Monday, March 12, 2007 @ 00:47:58 Author: dan Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: package.c (1.85 -> 1.86) trans.c (1.44 -> 1.45) * Fix an issue where the same dependency was recorded multiple times in the 'required by' field. -----------+ package.c | 27 ++++++++++++++++++--------- trans.c | 33 ++++++++++++++++++++++----------- 2 files changed, 40 insertions(+), 20 deletions(-) Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.85 pacman-lib/lib/libalpm/package.c:1.86 --- pacman-lib/lib/libalpm/package.c:1.85 Wed Mar 7 02:45:30 2007 +++ pacman-lib/lib/libalpm/package.c Mon Mar 12 00:47:58 2007 @@ -540,6 +540,7 @@ void _alpm_pkg_update_requiredby(pmpkg_t *pkg) { alpm_list_t *i, *j, *k; + const char *pkgname = alpm_pkg_get_name(pkg); pmdb_t *localdb = alpm_option_get_localdb(); for(i = _alpm_db_get_pkgcache(localdb); i; i = i->next) { @@ -547,6 +548,8 @@ continue; } pmpkg_t *cachepkg = i->data; + const char *cachepkgname = alpm_pkg_get_name(cachepkg); + for(j = alpm_pkg_get_depends(cachepkg); j; j = j->next) { pmdepend_t *dep; if(!j->data) { @@ -558,23 +561,29 @@ } /* check the actual package itself */ - if(strcmp(dep->name, alpm_pkg_get_name(pkg)) == 0) { - _alpm_log(PM_LOG_DEBUG, _("adding '%s' in requiredby field for '%s'"), - cachepkg->name, pkg->name); + if(strcmp(dep->name, pkgname) == 0) { alpm_list_t *reqs = alpm_pkg_get_requiredby(pkg); - reqs = alpm_list_add(reqs, strdup(alpm_pkg_get_name(cachepkg))); - pkg->requiredby = reqs; + + if(!alpm_list_find_str(reqs, cachepkgname)) { + _alpm_log(PM_LOG_DEBUG, _("adding '%s' in requiredby field for '%s'"), + cachepkgname, pkg->name); + reqs = alpm_list_add(reqs, strdup(cachepkgname)); + pkg->requiredby = reqs; + } } /* check for provisions as well */ for(k = alpm_pkg_get_provides(pkg); k; k = k->next) { const char *provname = k->data; if(strcmp(dep->name, provname) == 0) { - _alpm_log(PM_LOG_DEBUG, _("adding '%s' in requiredby field for '%s' (provides: %s)"), - alpm_pkg_get_name(cachepkg), alpm_pkg_get_name(pkg), provname); alpm_list_t *reqs = alpm_pkg_get_requiredby(pkg); - reqs = alpm_list_add(reqs, strdup(alpm_pkg_get_name(cachepkg))); - pkg->requiredby = reqs; + + if(!alpm_list_find_str(reqs, cachepkgname)) { + _alpm_log(PM_LOG_DEBUG, _("adding '%s' in requiredby field for '%s' (provides: %s)"), + cachepkgname, pkgname, provname); + reqs = alpm_list_add(reqs, strdup(cachepkgname)); + pkg->requiredby = reqs; + } } } free(dep); Index: pacman-lib/lib/libalpm/trans.c diff -u pacman-lib/lib/libalpm/trans.c:1.44 pacman-lib/lib/libalpm/trans.c:1.45 --- pacman-lib/lib/libalpm/trans.c:1.44 Wed Mar 7 02:45:30 2007 +++ pacman-lib/lib/libalpm/trans.c Mon Mar 12 00:47:58 2007 @@ -254,6 +254,7 @@ { alpm_list_t *i, *j; alpm_list_t *depends = NULL; + const char *pkgname; pmdb_t *localdb; ALPM_LOG_FUNC; @@ -262,10 +263,12 @@ ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(pkg != NULL, RET_ERR(PM_ERR_PKG_INVALID, -1)); + pkgname = alpm_pkg_get_name(pkg); depends = alpm_pkg_get_depends(pkg); + if(depends) { _alpm_log(PM_LOG_DEBUG, _("updating dependency packages 'requiredby' fields for %s-%s"), - pkg->name, pkg->version); + pkgname, pkg->version); } else { _alpm_log(PM_LOG_DEBUG, _("package has no dependencies, no other packages to update")); } @@ -302,16 +305,20 @@ found_provides = 1; /* this is cheating... we call this function to populate the package */ - alpm_pkg_get_requiredby(deppkg); + alpm_list_t *rqdby = alpm_pkg_get_requiredby(deppkg); - _alpm_log(PM_LOG_DEBUG, _("updating 'requiredby' field for package '%s'"), alpm_pkg_get_name(deppkg)); + _alpm_log(PM_LOG_DEBUG, _("updating 'requiredby' field for package '%s'"), + alpm_pkg_get_name(deppkg)); if(trans->type == PM_TRANS_TYPE_REMOVE) { void *data = NULL; - deppkg->requiredby = alpm_list_remove(deppkg->requiredby, - alpm_pkg_get_name(pkg), _alpm_str_cmp, &data); + rqdby = alpm_list_remove(rqdby, pkgname, _alpm_str_cmp, &data); FREE(data); + deppkg->requiredby = rqdby; } else { - deppkg->requiredby = alpm_list_add(deppkg->requiredby, strdup(alpm_pkg_get_name(pkg))); + if(!alpm_list_find_str(rqdby, pkgname)) { + rqdby = alpm_list_add(rqdby, strdup(pkgname)); + deppkg->requiredby = rqdby; + } } if(_alpm_db_write(localdb, deppkg, INFRQ_DEPENDS)) { @@ -328,16 +335,20 @@ } /* this is cheating... we call this function to populate the package */ - alpm_pkg_get_requiredby(deppkg); + alpm_list_t *rqdby = alpm_pkg_get_requiredby(deppkg); - _alpm_log(PM_LOG_DEBUG, _("updating 'requiredby' field for package '%s'"), deppkg->name); + _alpm_log(PM_LOG_DEBUG, _("updating 'requiredby' field for package '%s'"), + alpm_pkg_get_name(deppkg)); if(trans->type == PM_TRANS_TYPE_REMOVE) { void *data = NULL; - deppkg->requiredby = alpm_list_remove(deppkg->requiredby, - alpm_pkg_get_name(pkg), _alpm_str_cmp, &data); + rqdby = alpm_list_remove(rqdby, pkgname, _alpm_str_cmp, &data); FREE(data); + deppkg->requiredby = rqdby; } else { - deppkg->requiredby = alpm_list_add(deppkg->requiredby, strdup(alpm_pkg_get_name(pkg))); + if(!alpm_list_find_str(rqdby, pkgname)) { + rqdby = alpm_list_add(rqdby, strdup(pkgname)); + deppkg->requiredby = rqdby; + } } if(_alpm_db_write(localdb, deppkg, INFRQ_DEPENDS)) {

1 0

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

12 Mar '07

Date: Sunday, March 11, 2007 @ 16:53:51 Author: dan Path: /home/cvs-pacman/pacman-lib Added: src/pacman/po/ru_RU.po (1.1) Modified: doc/pacman.8 (1.8 -> 1.9) src/pacman/po/LINGUAS (1.4 -> 1.5) * Added Russian language translation. Thanks! Вам Зачем <4rayven(a)gmail.com> * Updated manpage to document --cachedir and --dbpath options. ------------------------+ doc/pacman.8 | 21 src/pacman/po/LINGUAS | 1 src/pacman/po/ru_RU.po | 1078 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1094 insertions(+), 6 deletions(-) Index: pacman-lib/doc/pacman.8 diff -u pacman-lib/doc/pacman.8:1.8 pacman-lib/doc/pacman.8:1.9 --- pacman-lib/doc/pacman.8:1.8 Sat Feb 24 18:40:38 2007 +++ pacman-lib/doc/pacman.8 Sun Mar 11 16:53:50 2007 @@ -68,6 +68,10 @@ .SH OPTIONS .TP +.B \-b, --dbpath \fIpath\fP +Specify an alternative database location (default is "/var/lib/pacman/"). This +should not be used unless you know what you are doing. +.TP .B \-d, --nodeps Skips all dependency checks. Normally, pacman will always check a package's dependency fields to ensure that all dependencies are installed and there are @@ -80,16 +84,21 @@ used with care, ideally not at all. .TP .B \-r, --root \fIpath\fP -Specify an alternative installation root (default is "/"). However, this should -\fInot\fP be used as a way to install software into /usr/local instead of /usr, -for example. This option should be used if you want to install a package on a -temporary mounted partition, which is "owned" by another system. By using this -option you not only specify where the software should be installed, but you -also specify which package database to use. +Specify an alternative installation root (default is "/"). This should +\fInot\fP be used as a way to install software into /usr/local instead of /usr. +This option is used if you want to install a package on a temporary mounted +partition which is "owned" by another system. By using this option you not only +specify where the software should be installed, but you also specify which +package database and cache location to use. .TP .B \-v, --verbose Output more status messages, such as the Root and DBPath. .TP +.B \--cachedir \fIdir\fP +Specify an alternative package cache location (default is +"/var/cache/pacman/pkg/"). This should not be used unless you know what you are +doing. +.TP .B \--config \fIfilepath\fP Specify an alternate configuration file. .TP Index: pacman-lib/src/pacman/po/LINGUAS diff -u pacman-lib/src/pacman/po/LINGUAS:1.4 pacman-lib/src/pacman/po/LINGUAS:1.5 --- pacman-lib/src/pacman/po/LINGUAS:1.4 Wed Mar 7 11:36:43 2007 +++ pacman-lib/src/pacman/po/LINGUAS Sun Mar 11 16:53:51 2007 @@ -5,3 +5,4 @@ it pt_BR en_GB +ru_RU Index: pacman-lib/src/pacman/po/ru_RU.po diff -u /dev/null pacman-lib/src/pacman/po/ru_RU.po:1.1 --- /dev/null Sun Mar 11 16:53:51 2007 +++ pacman-lib/src/pacman/po/ru_RU.po Sun Mar 11 16:53:51 2007 @@ -0,0 +1,1078 @@ +# Pacman Russian Translation +# Copyright (C) YEAR 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 +# +msgid "" +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-07 11:45-0500\n" +"PO-Revision-Date: 2007-03-07 11:45-0500\n" +"Last-Translator: Vladimir Bayrakovskiy <4rayven(a)gmail.com>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/pacman/add.c:72 src/pacman/remove.c:82 src/pacman/sync.c:482 +#: src/pacman/sync.c:531 +#, c-format +msgid "" +" if you're sure a package manager is not already running,\n" +" you can remove %s%s\n" +msgstr "" +" если Вы уверены, что pacman уже не запущен, можете\n" +" удалить %s%s\n" + +#: src/pacman/add.c:79 +msgid "loading package data... " +msgstr "чтение информации о пакете... " + +#: src/pacman/add.c:83 +#, c-format +msgid "failed to add target '%s' (%s)" +msgstr "" + +#: src/pacman/add.c:88 src/pacman/sync.c:196 src/pacman/trans.c:73 +#: src/pacman/trans.c:80 src/pacman/trans.c:84 src/pacman/trans.c:94 +#: src/pacman/trans.c:108 src/pacman/trans.c:122 src/pacman/trans.c:134 +#: src/pacman/trans.c:145 +msgid "done.\n" +msgstr "готово.\n" + +#: src/pacman/add.c:95 src/pacman/remove.c:101 src/pacman/sync.c:616 +#, c-format +msgid "failed to prepare transaction (%s)\n" +msgstr "" + +#: src/pacman/add.c:104 +#, c-format +msgid ":: %s: requires %s" +msgstr ":: %s: требует %s" + +#: src/pacman/add.c:125 src/pacman/sync.c:645 +#, c-format +msgid ":: %s: conflicts with %s" +msgstr ":: %s: конфликтует с %s" + +#: src/pacman/add.c:134 src/pacman/sync.c:709 +#, c-format +msgid "%s exists in both '%s' and '%s'\n" +msgstr "%s содержится в '%s' и в '%s'\n" + +#: src/pacman/add.c:140 src/pacman/sync.c:715 +#, c-format +msgid "%s: %s exists in filesystem\n" +msgstr "%s: %s уже есть на диске\n" + +#: src/pacman/add.c:146 src/pacman/sync.c:721 src/pacman/sync.c:727 +msgid "" +"\n" +"errors occurred, no packages were upgraded.\n" +msgstr "" +"\n" +"произошли ошибки, пакеты небыли обновлены.\n" + +#: src/pacman/add.c:156 src/pacman/sync.c:652 +#, c-format +msgid ":: %.1f MB required, have %.1f MB" +msgstr ":: требуется %.1f MB, доступно %.1f MB" + +#: src/pacman/add.c:169 src/pacman/remove.c:141 src/pacman/sync.c:702 +#, c-format +msgid "failed to commit transaction (%s)\n" +msgstr "не удалось завершить операцию (%s)\n" + +#: src/pacman/add.c:179 src/pacman/remove.c:151 src/pacman/sync.c:524 +#: src/pacman/sync.c:743 +#, c-format +msgid "failed to release transaction (%s)\n" +msgstr "не удалось продолжить операцию (%s)\n" + +#: src/pacman/deptest.c:86 +#, c-format +msgid "requires: %s" +msgstr "требуется: %s" + +#: src/pacman/log.c:63 +#, c-format +msgid "debug" +msgstr "отладка" + +#: src/pacman/log.c:66 +#, c-format +msgid "error" +msgstr "ошибка" + +#: src/pacman/log.c:69 +#, c-format +msgid "warning" +msgstr "предупреждение" + +#: src/pacman/log.c:75 +#, c-format +msgid "function" +msgstr "функция" + +#: src/pacman/log.c:194 +msgid "Y" +msgstr "" + +#: src/pacman/log.c:194 +msgid "YES" +msgstr "" + +#: src/pacman/log.h:30 +msgid "error: " +msgstr "ошибка: " + +#: src/pacman/log.h:34 +msgid "warning: " +msgstr "предупреждение: " + +#: src/pacman/package.c:60 +msgid "Explicitly installed" +msgstr "" + +#: src/pacman/package.c:63 +msgid "Installed as a dependency for another package" +msgstr "Установлен как зависимость другого пакета" + +#: src/pacman/package.c:66 src/pacman/package.c:90 +msgid "Unknown" +msgstr "Неизвестно" + +#: src/pacman/package.c:70 src/pacman/package.c:121 +msgid "Description : " +msgstr "Описание : " + +#: src/pacman/package.c:73 src/pacman/package.c:127 +#, c-format +msgid "Name : %s\n" +msgstr "Название : %s\n" + +#: src/pacman/package.c:74 src/pacman/package.c:128 +#, c-format +msgid "Version : %s\n" +msgstr "Версия : %s\n" + +#: src/pacman/package.c:75 +#, c-format +msgid "URL : %s\n" +msgstr "URL : %s\n" + +#: src/pacman/package.c:76 +msgid "License :" +msgstr "Лицензия :" + +#: src/pacman/package.c:77 src/pacman/package.c:129 +msgid "Groups :" +msgstr "Группы :" + +#: src/pacman/package.c:78 src/pacman/package.c:130 +msgid "Provides :" +msgstr "Обеспечивает :" + +#: src/pacman/package.c:79 src/pacman/package.c:131 +msgid "Depends On :" +msgstr "Зависит от :" + +#: src/pacman/package.c:80 src/pacman/package.c:132 +msgid "Removes :" +msgstr "Удаляет :" + +#: src/pacman/package.c:83 +msgid "Required By :" +msgstr "Требуется пакетами :" + +#: src/pacman/package.c:85 src/pacman/package.c:133 +msgid "Conflicts With :" +msgstr "Конфликтует с :" + +#: src/pacman/package.c:86 +#, c-format +msgid "Installed Size : %ld K\n" +msgstr "Размер установленного : %ld K\n" + +#: src/pacman/package.c:87 +#, c-format +msgid "Packager : %s\n" +msgstr "Сборщик : %s\n" + +#: src/pacman/package.c:88 +#, c-format +msgid "Architecture : %s\n" +msgstr "Архитектура : %s\n" + +#: src/pacman/package.c:89 +#, c-format +msgid "Build Date : %s %s\n" +msgstr "Дата сборки : %s %s\n" + +#: src/pacman/package.c:90 +#, c-format +msgid "Build Type : %s\n" +msgstr "Тип сборки : %s\n" + +#: src/pacman/package.c:92 +#, c-format +msgid "Install Date : %s %s\n" +msgstr "Дата установки : %s %s\n" + +#: src/pacman/package.c:93 +#, c-format +msgid "Install Reason : %s\n" +msgstr "Причина установки : %s\n" + +#: src/pacman/package.c:95 +#, c-format +msgid "Install Script : %s\n" +msgstr "Скрипт при установке : %s\n" + +#: src/pacman/package.c:96 +msgid "Yes" +msgstr "" + +#: src/pacman/package.c:96 +msgid "No" +msgstr "" + +#: src/pacman/package.c:126 +#, c-format +msgid "Repository : %s\n" +msgstr "Репозиторий : %s\n" + +#: src/pacman/package.c:134 +msgid "Replaces :" +msgstr "Заменяет :" + +#: src/pacman/package.c:135 +#, c-format +msgid "Download Size : %6.2f K\n" +msgstr "Размер при закачке : %6.2f K\n" + +#: src/pacman/package.c:136 +#, c-format +msgid "Installed Size : %6.2f K\n" +msgstr "Размер установленного : %6.2f K\n" + +#: src/pacman/package.c:144 +#, c-format +msgid "MD5 Sum : %s" +msgstr "Сумма MD5 : %s" + +#: src/pacman/package.c:147 +#, c-format +msgid "SHA1 Sum : %s" +msgstr "Сумма SHA1 : %s" + +#: src/pacman/package.c:158 +#, c-format +msgid "Backup Files:\n" +msgstr "Создает резервные копии файлов:\n" + +#: src/pacman/package.c:180 +#, c-format +msgid "error calculating checksums for %s\n" +msgstr "ошибка при вычислении контрольной суммы для %s\n" + +#: src/pacman/package.c:193 +#, c-format +msgid "MODIFIED\t%s\n" +msgstr "ИЗМЕНЕН\t%s\n" + +#: src/pacman/package.c:195 +#, c-format +msgid "Not Modified\t%s\n" +msgstr "Не Изменен\t%s\n" + +#: src/pacman/package.c:200 +#, c-format +msgid "MISSING\t\t%s\n" +msgstr "НЕ НАЙДЕН\t\t%s\n" + +#: src/pacman/package.c:206 +#, c-format +msgid "(none)\n" +msgstr "(пусто)\n" + +#: src/pacman/package.c:246 +#, c-format +msgid "No changelog available for '%s'.\n" +msgstr "Список измененний не доступен для пакета '%s'.\n" + +#: src/pacman/pacman.c:90 +#, c-format +msgid "usage: %s {-h --help}\n" +msgstr "использование: %s {-h --help}\n" + +#: src/pacman/pacman.c:91 +#, c-format +msgid " %s {-V --version}\n" +msgstr "" + +#: src/pacman/pacman.c:92 +#, c-format +msgid " %s {-A --add} [options] <file>\n" +msgstr " %s {-A --add} [опции] <файл>\n" + +#: src/pacman/pacman.c:93 +#, c-format +msgid " %s {-F --freshen} [options] <file>\n" +msgstr " %s {-F --freshen} [опции] <файл>\n" + +#: src/pacman/pacman.c:94 +#, c-format +msgid " %s {-Q --query} [options] [package]\n" +msgstr " %s {-Q --query} [опции] [пакет]\n" + +#: src/pacman/pacman.c:95 +#, c-format +msgid " %s {-R --remove} [options] <package>\n" +msgstr " %s {-R --remove} [опции] <пакет>\n" + +#: src/pacman/pacman.c:96 +#, c-format +msgid " %s {-S --sync} [options] [package]\n" +msgstr " %s {-S --sync} [опции] [пакет]\n" + +#: src/pacman/pacman.c:97 +#, c-format +msgid " %s {-U --upgrade} [options] <file>\n" +msgstr " %s {-U --upgrade} [опции] <файл>\n" + +#: src/pacman/pacman.c:98 +#, c-format +msgid "" +"\n" +"use '%s --help' with other options for more syntax\n" +msgstr "" +"\n" +"используйте '%s --help' вместе с другими опциями для более подробной " +"информации\n" + +#: src/pacman/pacman.c:101 +#, c-format +msgid "usage: %s {-A --add} [options] <file>\n" +msgstr "использование: %s {-A --add} [опции] <файл>\n" + +#: src/pacman/pacman.c:102 src/pacman/pacman.c:107 src/pacman/pacman.c:119 +#: src/pacman/pacman.c:124 src/pacman/pacman.c:138 +#, c-format +msgid "options:\n" +msgstr "опции:\n" + +#: src/pacman/pacman.c:103 src/pacman/pacman.c:109 src/pacman/pacman.c:120 +#: src/pacman/pacman.c:140 +#, c-format +msgid " -d, --nodeps skip dependency checks\n" +msgstr " -d, --nodeps не проверять зависимости\n" + +#: 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 принудительная установка, перезаписывать " +"конфликтующие файлы\n" + +#: src/pacman/pacman.c:106 +#, c-format +msgid "usage: %s {-R --remove} [options] <package>\n" +msgstr "использование: %s {-R --remove} [опции] <пакет>\n" + +#: src/pacman/pacman.c:108 +#, c-format +msgid "" +" -c, --cascade remove packages and all packages that depend on them\n" +msgstr " -c, --cascade удалить пакет и все зависящие от него пакеты\n" + +#: src/pacman/pacman.c:110 +#, c-format +msgid "" +" -k, --dbonly only remove database entry, do not remove files\n" +msgstr "" +" -k, --dbonly стереть только запись в базе данных, файлы не " +"удалять\n" + +#: src/pacman/pacman.c:111 +#, c-format +msgid " -n, --nosave remove configuration files as well\n" +msgstr " -n, --nosave удалить в том числе и конфигурационные файлы\n" + +#: src/pacman/pacman.c:112 +#, c-format +msgid "" +" -s, --recursive remove dependencies also (that won't break packages)\n" +msgstr "" +" -s, --recursive удалить вместе с зависимостями (которые не повредят " +"другие пакеты)\n" + +#: src/pacman/pacman.c:115 +#, c-format +msgid "usage: %s {-F --freshen} [options] <file>\n" +msgstr "использование: %s {-F --freshen} [опции] <файл>\n" + +#: src/pacman/pacman.c:117 +#, c-format +msgid "usage: %s {-U --upgrade} [options] <file>\n" +msgstr "использование: %s {-U --upgrade} [опции] <файл>\n" + +#: src/pacman/pacman.c:123 +#, c-format +msgid "usage: %s {-Q --query} [options] [package]\n" +msgstr "использование: %s {-Q --query} [опции] [пакет]\n" + +#: src/pacman/pacman.c:125 +#, c-format +msgid " -c, --changelog view the changelog of a package\n" +msgstr " -c, --changelog показать список изменений пакета\n" + +#: src/pacman/pacman.c:126 +#, c-format +msgid "" +" -e, --orphans list all packages installed as dependencies but no " +"longer\n" +msgstr "" +" -e, --orphans показать пакеты, установленные как зависимости,\n" + +#: src/pacman/pacman.c:127 +#, c-format +msgid " required by any package\n" +msgstr " но более не трубующиеся другим пакетам\n" + +#: 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 показать все пакеты данной группы\n" + +#: src/pacman/pacman.c:129 src/pacman/pacman.c:144 +#, c-format +msgid " -i, --info view package information\n" +msgstr " -i, --info показать информацию о пакете\n" + +#: src/pacman/pacman.c:130 +#, c-format +msgid " -l, --list list the contents of the queried package\n" +msgstr " -l, --list показать содержимое запрашиваемого пакета\n" + +#: src/pacman/pacman.c:131 +#, c-format +msgid "" +" -m, --foreign list all packages that were not found in the sync db" +"(s)\n" +msgstr "" +" -m, --foreign показать все пакеты не найденные в базе данных(s)\n" + +#: src/pacman/pacman.c:132 +#, c-format +msgid " -o, --owns <file> query the package that owns <file>\n" +msgstr " -o, --owns <файл> найти пакет сдержащий <файл>\n" + +#: src/pacman/pacman.c:133 +#, c-format +msgid "" +" -p, --file query the package file [package] instead of the " +"database\n" +msgstr "" +" -p, --file извлеч информацию из файла пакета [пакет], а не из " +"базы данных\n" + +#: src/pacman/pacman.c:134 +#, c-format +msgid "" +" -s, --search search locally-installed packages for matching " +"strings\n" +msgstr "" +" -s, --search искать указанную строку в локально установленных " +"пакетах\n" + +#: src/pacman/pacman.c:135 +#, c-format +msgid " -u, --upgrades list all packages that can be upgraded\n" +msgstr "" +" -u, --upgrades показать список всех пакетов, которые могут быть " +"обновлены\n" + +#: src/pacman/pacman.c:137 +#, c-format +msgid "usage: %s {-S --sync} [options] [package]\n" +msgstr "использование: %s {-S --sync} [опции] [пакет]\n" + +#: src/pacman/pacman.c:139 +#, c-format +msgid "" +" -c, --clean remove old packages from cache directory (-cc for " +"all)\n" +msgstr "" +" -c, --clean удалить старые пакеты из кэша (-cc чтобы удалеть все " +"пакеты из кэша)\n" + +#: src/pacman/pacman.c:141 +#, c-format +msgid " -e, --dependsonly install dependencies only\n" +msgstr " -e, --dependsonly установить только зависимости\n" + +#: src/pacman/pacman.c:145 +#, c-format +msgid "" +" -p, --print-uris print out URIs for given packages and their " +"dependencies\n" +msgstr "" +" -p, --print-uris напечатать ссылки для загрузки указанных пакетов и их " +"зависимостей\n" + +#: src/pacman/pacman.c:146 +#, c-format +msgid "" +" -s, --search search remote repositories for matching strings\n" +msgstr "" +" -s, --search искать указанную строку в репозиториях на удаленных " +"серверах\n" + +#: src/pacman/pacman.c:147 +#, c-format +msgid " -u, --sysupgrade upgrade all packages that are out of date\n" +msgstr " -u, --sysupgrade обновить все устаревшие пакеты\n" + +#: src/pacman/pacman.c:148 +#, c-format +msgid "" +" -w, --downloadonly download packages but do not install/upgrade " +"anything\n" +msgstr "" +" -w, --downloadonly загрузить пакеты с сервера, но ни чего не " +"устанавливать и не обновлять\n" + +#: src/pacman/pacman.c:149 +#, c-format +msgid "" +" -y, --refresh download fresh package databases from the server\n" +msgstr "" +" -y, --refresh загрузить свежие базы данных пакетов с сервера\n" + +#: src/pacman/pacman.c:150 +#, c-format +msgid "" +" --ignore <pkg> ignore a package upgrade (can be used more than " +"once)\n" +msgstr "" +" --ignore <pkg> игнорировать пакет при обновлинии (может быть " +"использовано неоднократно)\n" + +#: src/pacman/pacman.c:152 +#, c-format +msgid " --config <path> set an alternate configuration file\n" +msgstr "" +" --config <path> использовать алтернативный конфигурационный файл\n" + +#: src/pacman/pacman.c:153 +#, c-format +msgid " --noconfirm do not ask for anything confirmation\n" +msgstr " --noconfirm не спрашивать подтверждения\n" + +#: src/pacman/pacman.c:154 +#, c-format +msgid "" +" --ask <number> pre-specify answers for questions (see manpage)\n" +msgstr "" +" --ask <number> заранее подготовленные ответы на вопросы (смотрите " +"man-страницу)\n" + +#: src/pacman/pacman.c:155 +#, c-format +msgid "" +" --noprogressbar do not show a progress bar when downloading files\n" +msgstr "" + +#: src/pacman/pacman.c:156 +#, c-format +msgid "" +" --noscriptlet do not execute the install scriptlet if there is any\n" +msgstr "" +" --noscriptlet не запускать установочные скрипты, если они есть\n" + +#: src/pacman/pacman.c:157 +#, c-format +msgid " -v, --verbose be verbose\n" +msgstr " -v, --verbose выводить больше информации\n" + +#: src/pacman/pacman.c:158 +#, c-format +msgid " -r, --root <path> set an alternate installation root\n" +msgstr "" + +#: src/pacman/pacman.c:159 +#, c-format +msgid " -b, --dbpath <path> set an alternate database location\n" +msgstr "" + +#: src/pacman/pacman.c:160 +#, c-format +msgid " --cachedir <dir> set an alternate package cache location\n" +msgstr "" +" --cachedir <директория> указать альтернативное расположение кэша\n" + +#: src/pacman/pacman.c:173 +#, c-format +msgid " This program may be freely redistributed under\n" +msgstr "" + +#: src/pacman/pacman.c:174 +#, c-format +msgid " the terms of the GNU General Public License\n" +msgstr "" + +#: src/pacman/pacman.c:299 +#, c-format +msgid "'%s' is not a valid debug level" +msgstr "'%s' - неверный уровень отладки" + +#: src/pacman/pacman.c:314 +#, c-format +msgid "'%s' is not a valid cache directory\n" +msgstr "'%s' неправильно указан путь к кэш-директории\n" + +#: src/pacman/pacman.c:332 +#, c-format +msgid "'%s' is not a valid db path\n" +msgstr "'%s' неправильно указан путь к базе данных\n" + +#: src/pacman/pacman.c:362 +#, c-format +msgid "'%s' is not a valid root path\n" +msgstr "" + +#: src/pacman/pacman.c:389 +msgid "only one operation may be used at a time\n" +msgstr "одновременно может выполняться только одна операция\n" + +#: src/pacman/pacman.c:435 +msgid "warning: current locale is invalid; using default \"C\" locale" +msgstr "" + +#: src/pacman/pacman.c:455 +#, c-format +msgid "failed to initilize alpm library (%s)\n" +msgstr "не удалось инициализировать библиотеку alpm (%s)\n" + +#: src/pacman/pacman.c:488 +msgid "you cannot perform this operation unless you are root.\n" +msgstr "Вы не можете выполнить эту операцию если вы не root.\n" + +#: src/pacman/pacman.c:504 +#, c-format +msgid "failed to parse config (%s)\n" +msgstr "не удалось разобрать конфигурационный файл (%s)\n" + +#: src/pacman/pacman.c:514 src/pacman/remove.c:128 src/pacman/util.c:324 +msgid "Targets:" +msgstr "Цели:" + +#: src/pacman/pacman.c:520 +#, c-format +msgid "could not register 'local' database (%s)\n" +msgstr "не могу зарегистрировать 'локальную' бызу данных (%s)\n" + +#: src/pacman/pacman.c:527 +msgid "no targets specified (use -h for help)\n" +msgstr "не задано целей (для помощи используйте -h)\n" + +#: src/pacman/pacman.c:540 +msgid "no operation specified (use -h for help)\n" +msgstr "не указаны конкретные операции (для помощи используйте -h)\n" + +#: src/pacman/query.c:56 +msgid "no file was specified for --owns\n" +msgstr "не был указан файл для --owns\n" + +#: src/pacman/query.c:74 +#, c-format +msgid "%s is owned by %s %s\n" +msgstr "%s принадлежит %s %s\n" + +#: src/pacman/query.c:81 +#, c-format +msgid "No package owns %s\n" +msgstr "Ни один пакет не содержит %s\n" + +#: src/pacman/query.c:122 src/pacman/sync.c:453 +msgid "no usable package repositories configured.\n" +msgstr "ни один репозиторий не сконфигурирован должным образом.\n" + +#: src/pacman/query.c:128 +msgid "Checking for package upgrades..." +msgstr "Проверка обновлений..." + +#: src/pacman/query.c:135 +msgid "no upgrades found" +msgstr "обновлений не найдено" + +#: src/pacman/query.c:173 +#, c-format +msgid "group \"%s\" was not found\n" +msgstr "группа \"%s\" не найдена\n" + +#: src/pacman/query.c:184 +msgid "no package file was specified for --file\n" +msgstr "не указан файл пакета для опции --file\n" + +#: src/pacman/query.c:188 +#, c-format +msgid "failed to load package '%s' (%s)\n" +msgstr "не удалось загрузить пакет '%s' (%s)\n" + +#: src/pacman/query.c:226 src/pacman/query.c:258 +#, c-format +msgid "package \"%s\" not found\n" +msgstr "пакет \"%s\" не найден\n" + +#: src/pacman/remove.c:61 src/pacman/sync.c:568 +#, c-format +msgid ":: group %s:\n" +msgstr ":: группа %s:\n" + +#: src/pacman/remove.c:63 +msgid " Remove whole content? [Y/n] " +msgstr " Удалить все содержимое? [Y/n] " + +#: src/pacman/remove.c:67 +#, c-format +msgid ":: Remove %s from group %s? [Y/n] " +msgstr ":: Удалить %s из группы %s? [Y/n] " + +#: src/pacman/remove.c:80 src/pacman/sync.c:480 src/pacman/sync.c:529 +#, c-format +msgid "failed to init transaction (%s)\n" +msgstr "не удалось начать операцию (%s)\n" + +#: src/pacman/remove.c:92 +#, c-format +msgid "failed to add target '%s' (%s)\n" +msgstr "" + +#: src/pacman/remove.c:106 +#, c-format +msgid ":: %s is required by %s\n" +msgstr ":: %s необходим для %s\n" + +#: src/pacman/remove.c:131 +msgid "" +"\n" +"Do you want to remove these packages? [Y/n] " +msgstr "" +"\n" +"Хотите удалить эти пакеты? [Y/n] " + +#: src/pacman/sync.c:115 +msgid "Do you want to remove old packages from cache? [Y/n] " +msgstr "Хотите удалить старые пакеты из кэша? [Y/n] " + +#: src/pacman/sync.c:117 +msgid "removing old packages from cache... " +msgstr "удаляю старые пакеты из кэша... " + +#: src/pacman/sync.c:120 +msgid "could not access cache directory\n" +msgstr "нет доступа к кэш-директории\n" + +#: src/pacman/sync.c:181 +msgid "Do you want to remove all packages from cache? [Y/n] " +msgstr "Хотите удалить все пакеты из кэша? [Y/n] " + +#: src/pacman/sync.c:183 +msgid "removing all packages from cache... " +msgstr "удаляю все пакеты из кэша... " + +#: src/pacman/sync.c:186 +msgid "could not remove cache directory\n" +msgstr "не могу удалить кэш-директорию\n" + +#: src/pacman/sync.c:191 +msgid "could not create new cache directory\n" +msgstr "не могу создать новую директорию для кэша\n" + +#: src/pacman/sync.c:218 +#, c-format +msgid "failed to synchronize %s: %s\n" +msgstr "не удалось синхронизировать %s: %s\n" + +#: src/pacman/sync.c:220 +#, c-format +msgid "failed to update %s (%s)\n" +msgstr "не удалось обновить %s (%s)\n" + +#: src/pacman/sync.c:223 +#, c-format +msgid " %s is up to date\n" +msgstr " %s не устарел\n" + +#: src/pacman/sync.c:345 +#, c-format +msgid "repository '%s' does not exist\n" +msgstr "репозиторий '%s' не существует\n" + +#: src/pacman/sync.c:361 +#, c-format +msgid "package '%s' was not found in repository '%s'\n" +msgstr "пакет '%s' не найден в репозитории '%s'\n" + +#: src/pacman/sync.c:381 +#, c-format +msgid "package '%s' was not found\n" +msgstr "пакет '%s' не найден\n" + +#: src/pacman/sync.c:418 +#, c-format +msgid "repository \"%s\" was not found.\n" +msgstr "репозиторий \"%s\" не найден.\n" + +#: src/pacman/sync.c:490 +msgid ":: Synchronizing package databases...\n" +msgstr ":: Синхронизирую базу данных пакетов...\n" + +#: src/pacman/sync.c:491 +msgid "synchronizing package lists" +msgstr "синхронизирую список пакетов" + +#: src/pacman/sync.c:493 +msgid "failed to synchronize any databases" +msgstr "не удалось синхронизировать ни одну базу данных" + +#: src/pacman/sync.c:499 +msgid ":: Starting full system upgrade...\n" +msgstr ":: Начинаю полное обновление системы...\n" + +#: src/pacman/sync.c:500 +msgid "starting full system upgrade" +msgstr "начинаю полное обновление системы" + +#: src/pacman/sync.c:518 +msgid "" +"\n" +":: pacman has detected a newer version of the \"pacman\" package.\n" +msgstr "" +"\n" +":: pacman обнаружил более новую версию пакета \"pacman\".\n" + +#: src/pacman/sync.c:519 +msgid ":: It is recommended that you allow pacman to upgrade itself\n" +msgstr ":: Рекомендуем Вам сначала позволить pacman'у обновить себя самого,\n" + +#: src/pacman/sync.c:520 +msgid ":: first, then you can re-run the operation with the newer version.\n" +msgstr ":: после чего перезапустить операцию с использованием новой версии.\n" + +#: src/pacman/sync.c:522 +msgid ":: Upgrade pacman first? [Y/n] " +msgstr ":: Сначала обновить pacman? [Y/n] " + +#: src/pacman/sync.c:537 +#, c-format +msgid "pacman: %s\n" +msgstr "" + +#: src/pacman/sync.c:557 +#, c-format +msgid "'%s': %s\n" +msgstr "" + +#: src/pacman/sync.c:572 +msgid ":: Install whole content? [Y/n] " +msgstr ":: Установить в полном объеме? [Y/n] " + +#: src/pacman/sync.c:579 +#, c-format +msgid ":: Install %s from group %s? [Y/n] " +msgstr ":: Установить %s из группы %s? [Y/n] " + +#: src/pacman/sync.c:603 +#, c-format +msgid "'%s': not found in sync db\n" +msgstr "'%s': не найдено в базе данных\n" + +#: src/pacman/sync.c:623 +msgid "requires" +msgstr "требует" + +#: src/pacman/sync.c:623 +msgid "is required by" +msgstr "требуется для" + +#: src/pacman/sync.c:665 +msgid " local database is up to date\n" +msgstr " локальная база данных не устарела\n" + +#: src/pacman/sync.c:674 +msgid "" +"\n" +"Beginning download...\n" +msgstr "" +"\n" +"Начинаю загрузку...\n" + +#: src/pacman/sync.c:678 +msgid "Proceed with download? [Y/n] " +msgstr "Приступить к загрузке? [Y/n] " + +#: src/pacman/sync.c:686 +msgid "" +"\n" +"Beginning upgrade process...\n" +msgstr "" +"\n" +"Начинаю процесс обновления...\n" + +#: src/pacman/sync.c:690 +msgid "Proceed with installation? [Y/n] " +msgstr "Приступить к установке? [Y/n] " + +#: src/pacman/trans.c:55 +msgid "checking dependencies... " +msgstr "проверяю зависимости... " + +#: src/pacman/trans.c:59 +msgid "checking for file conflicts... " +msgstr "проверяю возможные конфликты файлов... " + +#: src/pacman/trans.c:63 +msgid "cleaning up... " +msgstr "убираем за собой... " + +#: src/pacman/trans.c:66 +msgid "resolving dependencies... " +msgstr "разрешаю зависимости... " + +#: src/pacman/trans.c:69 +msgid "looking for inter-conflicts... " +msgstr "проверка на взаимную несовместимость... " + +#: src/pacman/trans.c:89 +#, c-format +msgid "installing %s... " +msgstr "устанавливаю %s... " + +#: src/pacman/trans.c:96 +#, c-format +msgid "installed %s (%s)" +msgstr "установлено %s (%s)" + +#: src/pacman/trans.c:103 +#, c-format +msgid "removing %s... " +msgstr "удаляю %s... " + +#: src/pacman/trans.c:110 +#, c-format +msgid "removed %s (%s)" +msgstr "удалено %s (%s)" + +#: src/pacman/trans.c:117 +#, c-format +msgid "upgrading %s... " +msgstr "обновляю %s... " + +#: src/pacman/trans.c:124 +#, c-format +msgid "upgraded %s (%s -> %s)" +msgstr "обновлено %s (%s -> %s)" + +#: src/pacman/trans.c:131 +msgid "checking package integrity... " +msgstr "проверяю целостность пакета... " + +#: src/pacman/trans.c:147 +msgid "failed.\n" +msgstr "провал.\n" + +#: src/pacman/trans.c:154 +#, c-format +msgid ":: Retrieving packages from %s...\n" +msgstr ":: Получение пакетов с %s...\n" + +#: src/pacman/trans.c:175 +#, c-format +msgid ":: %1$s requires %2$s from IgnorePkg. Install %2$s? [Y/n] " +msgstr ":: %1$s требует %2$s из IgnorePkg. Установить %2$s? [Y/n] " + +#: src/pacman/trans.c:180 +#, c-format +msgid ":: %s is in IgnorePkg. Install anyway? [Y/n] " +msgstr ":: %s указан в IgnorePkg. Все равно установить? [Y/n] " + +#: src/pacman/trans.c:193 +#, c-format +msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] " +msgstr ":: %s указан в HoldPkg. Все равно удалить? [Y/n] " + +#: src/pacman/trans.c:206 +#, c-format +msgid ":: Replace %s with %s/%s? [Y/n] " +msgstr ":: Заменить %s на %s/%s? [Y/n] " + +#: src/pacman/trans.c:221 +#, c-format +msgid ":: %s conflicts with %s. Remove %s? [Y/n] " +msgstr ":: %s конфликтует с %s. Удалить %s? [Y/n] " + +#: src/pacman/trans.c:237 +#, c-format +msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] " +msgstr ":: %s-%s: установленная версия новее. Все равно обновить? [Y/n] " + +#: src/pacman/trans.c:255 +#, c-format +msgid ":: %s-%s: local version is up to date. Upgrade anyway? [Y/n] " +msgstr ":: %s-%s: установленная версия не устарела. Все равно обновить? [Y/n] " + +#: src/pacman/trans.c:273 +#, c-format +msgid ":: Archive %s is corrupted. Do you want to delete it? [Y/n] " +msgstr ":: Архив %s поврежден. Хотите его удалить? [Y/n] " + +#: src/pacman/trans.c:329 +msgid "installing" +msgstr "установка" + +#: src/pacman/trans.c:332 +msgid "upgrading" +msgstr "обновление" + +#: src/pacman/trans.c:335 +msgid "removing" +msgstr "удаление" + +#: src/pacman/trans.c:338 +msgid "checking for file conflicts" +msgstr "порверяю возможные конфликты файлов" + +#: src/pacman/util.c:259 +#, c-format +msgid "None\n" +msgstr "Не указано\n" + +#: src/pacman/util.c:311 +msgid "Remove:" +msgstr "Удалить:" + +#: src/pacman/util.c:319 +#, c-format +msgid "" +"\n" +"Total Removed Size: %.2f MB\n" +msgstr "" +"\n" +"Итого удалено: %.2f МБ\n" + +#: src/pacman/util.c:330 +#, c-format +msgid "" +"\n" +"Total Package Size: %.2f MB\n" +msgstr "" +"\n" +"Суммарный размер пакетов: %.2f МБ\n" + +#: src/pacman/util.c:337 +#, c-format +msgid "Total Installed Size: %.2f MB\n" +msgstr "Итого установленно: %.2f МБ\n"

4 4

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

12 Mar '07

Date: Sunday, March 11, 2007 @ 23:02:58 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/Makefile.am (1.19 -> 1.20) lib/libalpm/be_files.c (1.36 -> 1.37) lib/libalpm/db.h (1.30 -> 1.31) scripts/rankmirrors (1.7 -> 1.8) src/pacman/Makefile.am (1.16 -> 1.17) src/util/Makefile.am (1.11 -> 1.12) * Removed ${CFLAGS} from Makefile.am(s) as it was causing all CFLAGS to be duplicated. * Updated the util Makefile.am to link with the proper libalpm.la. * Fixed bitmasking issues in be_files.c and db.h. * Rankmirrors updates from James Rosten (with some cleaning up of my own). KeyboardInterrupts are now handled gracefully. -------------------------+ lib/libalpm/Makefile.am | 2 lib/libalpm/be_files.c | 7 ++- lib/libalpm/db.h | 3 - scripts/rankmirrors | 98 +++++++++++++++++++++++++++------------------- src/pacman/Makefile.am | 2 src/util/Makefile.am | 4 - 6 files changed, 70 insertions(+), 46 deletions(-) Index: pacman-lib/lib/libalpm/Makefile.am diff -u pacman-lib/lib/libalpm/Makefile.am:1.19 pacman-lib/lib/libalpm/Makefile.am:1.20 --- pacman-lib/lib/libalpm/Makefile.am:1.19 Sun Mar 11 17:10:02 2007 +++ pacman-lib/lib/libalpm/Makefile.am Sun Mar 11 23:02:57 2007 @@ -8,7 +8,7 @@ localedir = $(datadir)/locale DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ -AM_CFLAGS = -fvisibility=hidden -pedantic -D_GNU_SOURCE $(CFLAGS) +AM_CFLAGS = -fvisibility=hidden -pedantic -D_GNU_SOURCE EXTRA_DIST = Doxyfile Index: pacman-lib/lib/libalpm/be_files.c diff -u pacman-lib/lib/libalpm/be_files.c:1.36 pacman-lib/lib/libalpm/be_files.c:1.37 --- pacman-lib/lib/libalpm/be_files.c:1.36 Mon Mar 5 17:13:33 2007 +++ pacman-lib/lib/libalpm/be_files.c Sun Mar 11 23:02:57 2007 @@ -227,7 +227,12 @@ return(-1); } - if(info->infolevel & inforeq) { + /* bitmask logic here: + * infolevel: 00001111 + * inforeq: 00010100 + * & result: 00000100 + * == to inforeq? nope, we need to load more info. */ + if((info->infolevel & inforeq) == inforeq) { /* already loaded this info, do nothing */ return(0); } Index: pacman-lib/lib/libalpm/db.h diff -u pacman-lib/lib/libalpm/db.h:1.30 pacman-lib/lib/libalpm/db.h:1.31 --- pacman-lib/lib/libalpm/db.h:1.30 Sat Mar 3 03:13:59 2007 +++ pacman-lib/lib/libalpm/db.h Sun Mar 11 23:02:57 2007 @@ -33,7 +33,8 @@ INFRQ_DEPENDS = 0x04, INFRQ_FILES = 0x08, INFRQ_SCRIPTLET = 0x10, - INFRQ_ALL = 0xFF + /* ALL should be sum of all above */ + INFRQ_ALL = 0x1F } pmdbinfrq_t; /* Database */ Index: pacman-lib/scripts/rankmirrors diff -u pacman-lib/scripts/rankmirrors:1.7 pacman-lib/scripts/rankmirrors:1.8 --- pacman-lib/scripts/rankmirrors:1.7 Sun Mar 4 21:32:14 2007 +++ pacman-lib/scripts/rankmirrors Sun Mar 11 23:02:58 2007 @@ -23,9 +23,6 @@ import os, sys, datetime, time, socket, urllib2 from optparse import OptionParser -# TODO: handle KeyboardInterrupt better, print list of already timed -# servers and then exit. Easier if program is function-ized. - def createOptParser(): usage = "usage: %prog [options] MIRRORFILE | URL" description = "Ranks pacman mirrors by their connection and opening " \ @@ -33,27 +30,28 @@ "can also rank one mirror if the URL is provided." parser = OptionParser(usage = usage, description = description) parser.add_option("-n", type = "int", dest = "num", default = 0, - help = "number of servers to output, 0 for all") + help = "number of servers to output, 0 for all") parser.add_option("-t", "--times", action = "store_true", - dest = "times", default = False, - help = "only output mirrors and their response times") + dest = "times", default = False, + help = "only output mirrors and their response times") parser.add_option("-u", "--url", action = "store_true", dest = "url", - default=False, help="test a specific url") + default = False, help = "test a specific url") parser.add_option("-v", "--verbose", action = "store_true", - dest = "verbose", default = False, help ="be verbose in output") + dest = "verbose", default = False, + help = "be verbose in ouptut") return parser def timeCmd(cmd): - before = time.time(); + before = time.time() try: - cmd(); + cmd() except KeyboardInterrupt, ki: raise ki except socket.timeout, ioe: return 'timeout' except Exception, e: return 'unreachable' - return time.time() - before; + return time.time() - before def talkToServer(serverUrl): opener = urllib2.build_opener() @@ -63,10 +61,32 @@ return lambda : talkToServer(serverUrl) def cmpPairBySecond(p1, p2): - if p1[1] == p2[1]: return 0 - if p1[1] < p2[1]: return -1 + if p1[1] == p2[1]: + return 0 + if p1[1] < p2[1]: + return -1 return 1 +def printResults(servers, time, verbose, num): + items = servers.items() + items.sort(cmpPairBySecond) + itemsLen = len(items) + numToShow = num + if numToShow > itemsLen or numToShow == 0: + numToShow = itemsLen + if itemsLen > 0: + if time: + print + print ' Servers sorted by time (seconds):' + for i in items[0:numToShow]: + if i[1] == 'timeout' or i[1] == 'unreachable': + print i[0], ':', i[1] + else: + print i[0], ':', "%.2f" % i[1] + else: + for i in items[0:numToShow]: + print 'Server =', i[0] + if __name__ == "__main__": parser = createOptParser() (options, args) = parser.parse_args() @@ -81,12 +101,18 @@ if options.url: if options.verbose: print 'Testing', args[0] + '...' - serverToTime = timeCmd(getFuncToTime(args[0])) - print args[0], ':', serverToTime + try: + serverToTime = timeCmd(getFuncToTime(args[0])) + except KeyboardInterrupt, ki: + sys.exit(1) + if serverToTime == 'timeout' or serverToTime == 'unreachable': + print args[0], ':', serverToTime + else: + print args[0], ':', "%.2f" % serverToTime sys.exit(0) if not os.path.isfile(args[0]): - print 'file', args[0], 'does not exist.' + print >>sys.stderr, 'rankmirrors: file', args[0], 'does not exist.' sys.exit(1) fl = open(args[0], 'r') @@ -104,36 +130,28 @@ continue serverUrl = splitted[1].strip() - if serverUrl[-1] == '\n': serverUrl = serverUrl[0:-1] + if serverUrl[-1] == '\n': + serverUrl = serverUrl[0:-1] if options.verbose and options.times: - print serverUrl,'...', + print serverUrl, '...', elif options.verbose: - print '#',serverUrl,'...', + print '#', serverUrl, '...', elif options.times: print ' * ', sys.stdout.flush() - serverToTime[serverUrl] = timeCmd(getFuncToTime(serverUrl)) - if options.verbose: - try: - print "%.2f" % serverToTime[serverUrl] - except: - print serverToTime[serverUrl] - - items = serverToTime.items() - items.sort(cmpPairBySecond) - numToShow = int(options.num) - if numToShow == 0: numToShow = len(items) - if len(items) > 0: - if options.times: - print - print ' Servers sorted by time (seconds):' - for i in items[0:numToShow]: + try: + serverToTime[serverUrl] = timeCmd(getFuncToTime(serverUrl)) + if options.verbose: try: - print "%.2f" % i[1], ':', i[0] + print "%.2f" % serverToTime[serverUrl] except: - print i[1], ':', i[0] - else: - for i in items[0:numToShow]: - print 'Server =', i[0] + print serverToTime[serverUrl] + except: + print + printResults(serverToTime, options.times, options.verbose, + options.num) + sys.exit(0) + + printResults(serverToTime, options.times, options.verbose, options.num) # vim: set ts=4 sw=4 et: Index: pacman-lib/src/pacman/Makefile.am diff -u pacman-lib/src/pacman/Makefile.am:1.16 pacman-lib/src/pacman/Makefile.am:1.17 --- pacman-lib/src/pacman/Makefile.am:1.16 Wed Feb 21 23:36:03 2007 +++ pacman-lib/src/pacman/Makefile.am Sun Mar 11 23:02:58 2007 @@ -10,7 +10,7 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ INCLUDES = -I$(top_srcdir)/lib/libalpm -AM_CFLAGS = -D_GNU_SOURCE $(CFLAGS) +AM_CFLAGS = -D_GNU_SOURCE pacman_SOURCES = \ add.h add.c \ Index: pacman-lib/src/util/Makefile.am diff -u pacman-lib/src/util/Makefile.am:1.11 pacman-lib/src/util/Makefile.am:1.12 --- pacman-lib/src/util/Makefile.am:1.11 Sun Mar 4 01:28:49 2007 +++ pacman-lib/src/util/Makefile.am Sun Mar 11 23:02:58 2007 @@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/lib/libalpm vercmp_SOURCES = vercmp.c -vercmp_LDADD = $(top_builddir)/lib/libalpm/libalpm.la +vercmp_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la testpkg_SOURCES = testpkg.c -testpkg_LDADD = $(top_builddir)/lib/libalpm/libalpm.la +testpkg_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la

1 0

[pacman-dev] Translating Manpages
by Giovanni Scafora 12 Mar '07

12 Mar '07

Hi guys, are there news about translating manpages? Can you suggest a good tool to translate the manpages? Thanks. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

3 2

[pacman-dev] CVS update of pacman-lib/src/pacman (query.c)
by Dan McGee 12 Mar '07

12 Mar '07

Date: Sunday, March 11, 2007 @ 21:25:41 Author: dan Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: query.c (1.28 -> 1.29) * Fixed -Qil regression, now both flags are honored. (FS #1355) ---------+ query.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) Index: pacman-lib/src/pacman/query.c diff -u pacman-lib/src/pacman/query.c:1.28 pacman-lib/src/pacman/query.c:1.29 --- pacman-lib/src/pacman/query.c:1.28 Tue Mar 6 17:06:28 2007 +++ pacman-lib/src/pacman/query.c Sun Mar 11 21:25:40 2007 @@ -189,8 +189,7 @@ return(1); } if(config->op_q_info) { - dump_pkg_full(info, 0); - MSG(NL, "\n"); + dump_pkg_full(info, config->op_q_info); } if(config->op_q_list) { dump_pkg_files(info); @@ -260,6 +259,16 @@ } /* find a target */ + if(config->op_q_info) { + dump_pkg_full(info, config->op_q_info); + } + if(config->op_q_list) { + dump_pkg_files(info); + } + if(!config->op_q_info && !config->op_q_list) { + MSG(NL, "%s %s\n", alpm_pkg_get_name(info), + alpm_pkg_get_version(info)); + } if(config->op_q_changelog) { char changelog[PATH_MAX]; snprintf(changelog, PATH_MAX, "%s%s/%s/%s-%s/changelog", @@ -268,16 +277,6 @@ alpm_pkg_get_name(info), alpm_pkg_get_version(info)); dump_pkg_changelog(changelog, alpm_pkg_get_name(info)); - } else if(config->op_q_info) { - dump_pkg_full(info, config->op_q_info); - } else if(config->op_q_list) { - dump_pkg_files(info); - } else if(config->op_q_orphans) { - if(alpm_pkg_get_requiredby(info) == NULL) { - MSG(NL, "%s %s\n", alpm_pkg_get_name(info), alpm_pkg_get_version(info)); - } - } else { - MSG(NL, "%s %s\n", alpm_pkg_get_name(info), alpm_pkg_get_version(info)); } } }

1 0

[pacman-dev] rankmirrors update: better keyboardinterrupt handling FIX
by James Rosten 12 Mar '07

12 Mar '07

This is a patch to fix a problem caused by the original patch. Just apply this after applying the first patch. ~ Jamie / yankees26 Signed-off-by: James Rosten <seinfeld90(a)gmail.com> --- OLD/scripts/rankmirrors 62cb4a9d8edf7abad367ae2c1c9b7147b24402d1 +++ NEW/scripts/rankmirrors 51d5ca7e7ceb272886b3101f0c26fd03a1bbb7eb @@ -79,10 +79,10 @@ def printResults(servers, time, verbose, print print ' Servers sorted by time (seconds):' for i in items[0:numToShow]: - try: - print i[0], ':', "%.2f" % i[1] - except: + if i[1] == 'timeout' or i[1] == 'unreachable': print i[0], ':', i[1] + else: + print i[0], ':', "%.2f" % i[1] else: for i in items[0:numToShow]: print 'Server =', i[0] @@ -91,10 +91,10 @@ def printResults(servers, time, verbose, print print ' Servers sorted by time (seconds):' for i in items: - try: - print "%.2f" % i[0], ':', i[1] - except: - print i[0], ':', i[1] + if i[1] == 'timeout' or i[1] == 'unreachable': + print i[0], ':', i[1] + else: + print i[0], ':', "%.2f" % i[1] else: for i in items: print ' Server =', i[0]

1 0

[pacman-dev] Hungarian translation error
by Giovanni Scafora 12 Mar '07

12 Mar '07

Hi guys, I have got the following error: hu.po:7: headerfield `Language-Team' missing in header hu.po:35: `msgid' and `msgstr' entries do not both end with '\n' /usr/bin/msgfmt: found 1 fatal error Please, fix it. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

3 3

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

12 Mar '07

Date: Sunday, March 11, 2007 @ 20:43:53 Author: dan Path: /home/cvs-pacman/pacman-lib/src/pacman/po Modified: hu.po (1.10 -> 1.11) * Updates to Hungarian translation from Nagy, mostly cleanup stuff. -------+ hu.po | 409 ++++------------------------------------------------------------ 1 file changed, 28 insertions(+), 381 deletions(-) Index: pacman-lib/src/pacman/po/hu.po diff -u pacman-lib/src/pacman/po/hu.po:1.10 pacman-lib/src/pacman/po/hu.po:1.11 --- pacman-lib/src/pacman/po/hu.po:1.10 Sun Mar 11 17:32:59 2007 +++ pacman-lib/src/pacman/po/hu.po Sun Mar 11 20:43:53 2007 @@ -7,9 +7,10 @@ msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" -"POT-Creation-Date: 2007-03-11 16:46+0100\n" +"POT-Creation-Date: 2007-03-11 22:57+0100\n" "PO-Revision-Date: 2006-09-03 13:52+0200\n" "Last-Translator: Nagy Gabor <ngaba(a)petra.hos.u-szeged.hu>\n" +"Language-Team: Hungarian <translation-team-hu(a)lists.sourceforge.net>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" @@ -29,10 +30,10 @@ msgid "loading package data... " msgstr "csomag adatainak betöltése... " -#: src/pacman/add.c:83 src/pacman/remove.c:92 +#: src/pacman/add.c:83 #, c-format msgid "failed to add target '%s' (%s)" -msgstr "nem sikerült a '%s' célt hozzáadni a tranzakcióhoz (%s)\n" +msgstr "nem sikerült a '%s' célt hozzáadni a tranzakcióhoz (%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:84 src/pacman/trans.c:94 @@ -398,7 +399,8 @@ msgid "" " -s, --recursive remove dependencies also (that won't break packages)\n" msgstr "" -" -s, --recursive a függõségeket is távolítsa el (melyeknél ez biztonságos)\n" +" -s, --recursive a függõségeket is távolítsa el (melyeknél ez " +"biztonságos)\n" #: src/pacman/pacman.c:115 #, c-format @@ -432,7 +434,8 @@ #: src/pacman/pacman.c:127 #, c-format msgid " required by any package\n" -msgstr " telepítésre, de most már nem igényli õket más csomag\n" +msgstr "" +" telepítésre, de most már nem igényli õket más csomag\n" #: src/pacman/pacman.c:128 src/pacman/pacman.c:143 #, c-format @@ -455,8 +458,8 @@ " -m, --foreign list all packages that were not found in the sync db" "(s)\n" msgstr "" -" -m, --foreign a távoli repókban nem talált telepített " -"csomagok listája\n" +" -m, --foreign a távoli repókban nem talált telepített csomagok " +"listája\n" #: src/pacman/pacman.c:132 #, c-format @@ -469,15 +472,15 @@ " -p, --file query the package file [package] instead of the " "database\n" msgstr "" -" -p, --file <csomag> a <csomag> csomagfájl lekérdezése az adatbázis helyett\n" +" -p, --file <csomag> a <csomag> csomagfájl lekérdezése az adatbázis " +"helyett\n" #: src/pacman/pacman.c:134 #, c-format msgid "" " -s, --search search locally-installed packages for matching " "strings\n" -msgstr "" -" -s, --search [regex] keresés a telepített csomagok között\n" +msgstr " -s, --search [regex] keresés a telepített csomagok között\n" #: src/pacman/pacman.c:135 #, c-format @@ -515,8 +518,7 @@ #, c-format msgid "" " -s, --search search remote repositories for matching strings\n" -msgstr "" -" -s, --search [regex] keresés a távoli csomagadatbázisokban\n" +msgstr " -s, --search [regex] keresés a távoli csomagadatbázisokban\n" #: src/pacman/pacman.c:147 #, c-format @@ -528,15 +530,13 @@ msgid "" " -w, --downloadonly download packages but do not install/upgrade " "anything\n" -msgstr "" -" -w, --downloadonly csak letöltés, de semmit nem telepít/frissít\n" +msgstr " -w, --downloadonly csak letöltés, de semmit nem telepít/frissít\n" #: src/pacman/pacman.c:149 #, c-format msgid "" " -y, --refresh download fresh package databases from the server\n" -msgstr "" -" -y, --refresh friss csomagadatbázis letöltése a szerverrõl\n" +msgstr " -y, --refresh friss csomagadatbázis letöltése a szerverrõl\n" #: src/pacman/pacman.c:150 #, c-format @@ -561,7 +561,8 @@ msgid "" " --ask <number> pre-specify answers for questions (see manpage)\n" msgstr "" -" --ask <szám> elõre megadja a válaszokat kérdésekre (ld. man oldal)\n" +" --ask <szám> elõre megadja a válaszokat kérdésekre (ld. man " +"oldal)\n" #: src/pacman/pacman.c:155 #, c-format @@ -585,7 +586,8 @@ #: src/pacman/pacman.c:158 #, c-format msgid " -r, --root <path> set an alternate installation root\n" -msgstr " -r, --root <útvonal> alternatív telepítési gyökérkönyvtár beállítása\n" +msgstr "" +" -r, --root <útvonal> alternatív telepítési gyökérkönyvtár beállítása\n" #: src/pacman/pacman.c:159 #, c-format @@ -595,7 +597,8 @@ #: src/pacman/pacman.c:160 #, c-format msgid " --cachedir <dir> set an alternate package cache location\n" -msgstr " --cachedir <kvt> alternatív csomaggyorsítótár-könyvtár beállítása\n" +msgstr "" +" --cachedir <kvt> alternatív csomaggyorsítótár-könyvtár beállítása\n" #: src/pacman/pacman.c:173 #, c-format @@ -731,6 +734,11 @@ msgid "failed to init transaction (%s)\n" msgstr "nem sikerült inicializálni a tranzakciót (%s)\n" +#: src/pacman/remove.c:92 +#, c-format +msgid "failed to add target '%s' (%s)\n" +msgstr "nem sikerült a '%s' célt hozzáadni a tranzakcióhoz (%s)\n" + #: src/pacman/remove.c:106 #, c-format msgid ":: %s is required by %s\n" @@ -973,8 +981,7 @@ #: src/pacman/trans.c:175 #, c-format msgid ":: %1$s requires %2$s from IgnorePkg. Install %2$s? [Y/n] " -msgstr ":: %1$s igényli %2$s-t az IgnorePkg-bõl. Telepíti %2$s-t? " -"[I/n] " +msgstr ":: %1$s igényli %2$s-t az IgnorePkg-bõl. Telepíti %2$s-t? [I/n] " #: src/pacman/trans.c:180 #, c-format @@ -1058,363 +1065,3 @@ #, c-format msgid "Total Installed Size: %.2f MB\n" msgstr "Teljes telepített méret: %.2f MB\n" - -#, fuzzy -#~ msgid "Installed Size : %ld K\n" -#~ msgstr "Telepítõ szkript:%s\n" - -#, fuzzy -#~ msgid "could not repair 'local' database (%s)\n" -#~ msgstr "nem sikerült regisztrálni a 'local' adatbázist (%s)\n" - -#~ msgid "failed to add target '%s' (%s)\n" -#~ msgstr "nem sikerült a '%s' célt hozzáadni (%s)\n" - -#~ msgid "memory allocation failure\n" -#~ msgstr "memória allokálási hiba\n" - -#~ msgid "add target %s\n" -#~ msgstr "cél hozzáadása: %s\n" - -#~ msgid "could not add target (%s)\n" -#~ msgstr "nem sikerült hozzáadni a célt (%s)\n" - -#~ msgid "conflict: %s" -#~ msgstr "ütközik a következõvel: %s" - -#~ msgid "could not release transaction (%s)" -#~ msgstr "nem sikerült a tranzakciót lezárni (%s)" - -#~ msgid "] 100% LOCAL " -#~ msgstr "] 100% HELYI " - -#~ msgid " done.\n" -#~ msgstr " kész.\n" - -#~ msgid "done." -#~ msgstr "kész." - -#~ msgid "flow1" -#~ msgstr "információ1" - -#~ msgid "flow2" -#~ msgstr "információ2" - -#~ msgid "Size : %ld\n" -#~ msgstr "Méret : %ld\n" - -#~ msgid "Reason : " -#~ msgstr "Telepítés oka : " - -#~ msgid "Unknown\n" -#~ msgstr "Ismeretlen\n" - -#~ msgid "NOT " -#~ msgstr "NEM " - -#~ msgid "Name : %s\n" -#~ msgstr "Név : %s\n" - -#~ msgid "Version : %s\n" -#~ msgstr "Verzió : %s\n" - -#~ msgid "Groups :" -#~ msgstr "Csoportok :" - -#~ msgid "Provides :" -#~ msgstr "Szolgáltatja :" - -#~ msgid "Depends On :" -#~ msgstr "Függ :" - -#~ msgid "Removes :" -#~ msgstr "Eltávolítja :" - -#~ msgid "Conflicts With :" -#~ msgstr "Ütközik :" - -#~ msgid "Size (compressed) : %ld\n" -#~ msgstr "Méret (tömörített): %ld\n" - -#~ msgid "Size (uncompressed):%ld\n" -#~ msgstr "Méret (tömörítetlen): %ld\n" - -#~ msgid "Description : " -#~ msgstr "Leírás : " - -#~ msgid " looking in the database\n" -#~ msgstr " hogy az adatbázisban keresne\n" - -#~ msgid "bad root path" -#~ msgstr "rossz gyökérkönyvtár-útvonal" - -#~ msgid "failed to set option LOGMASK (%s)\n" -#~ msgstr "nem sikerült beállítani a LOGMASK opciót (%s)\n" - -#~ msgid "failed to set option LOGCB (%s)\n" -#~ msgstr "nem sikerült beállítani a LOGCB opciót (%s)\n" - -#~ msgid "failed to set option DLCB (%s)\n" -#~ msgstr "nem sikerült beállítani a DLCB opciót (%s)\n" - -#~ msgid "failed to set option DLFNM (%s)\n" -#~ msgstr "nem sikerült beállítani a DLFNM opciót (%s)\n" - -#~ msgid "failed to set option DLOFFSET (%s)\n" -#~ msgstr "nem sikerült beállítani a DLOFFSET opciót (%s)\n" - -#~ msgid "failed to set option DLT0 (%s)\n" -#~ msgstr "nem sikerült beállítani a DBT0 opciót (%s)\n" - -#~ msgid "failed to set option DLT (%s)\n" -#~ msgstr "nem sikerült beállítani a DLT opciót (%s)\n" - -#~ msgid "failed to set option DLRATE (%s)\n" -#~ msgstr "nem sikerült beállítani a DLRATE opciót (%s)\n" - -#~ msgid "failed to set option DLXFERED1 (%s)\n" -#~ msgstr "nem sikerült beállítani a DLXFERED1 opciót (%s)\n" - -#~ msgid "failed to set option DLETA_H (%s)\n" -#~ msgstr "nem sikerült beállítani a DLETA_H opciót (%s)\n" - -#~ msgid "failed to set option DLETA_M (%s)\n" -#~ msgstr "nem sikerült beállítani a DBETA_M opciót (%s)\n" - -#~ msgid "failed to set option DLETA_S (%s)\n" -#~ msgstr "nem sikerült beállítani a DLETA_S opciót (%s)\n" - -#~ msgid "failed to set option IGNOREPKG (%s)\n" -#~ msgstr "nem sikerült beállítani az IGNOREPKG opciót (%s)\n" - -#~ msgid "%s is not a file.\n" -#~ msgstr "a %s nem egy fájl.\n" - -#~ msgid "" -#~ "\n" -#~ "Targets:" -#~ msgstr "" -#~ "\n" -#~ "Célok:" - -#~ msgid ":: Starting local database upgrade...\n" -#~ msgstr ":: A helyi adatbázis frissítésének indítása...\n" - -#~ msgid "could not add target '%s': %s\n" -#~ msgstr "nem sikerült hozzáadni a '%s' célt: %s\n" - -#~ msgid "" -#~ "\n" -#~ "Targets: " -#~ msgstr "" -#~ "\n" -#~ "Célok: " - -#~ msgid "" -#~ "\n" -#~ "Total Uncompressed Package Size: %.1f MB\n" -#~ msgstr "" -#~ "\n" -#~ "Teljes tömörítetlen csomagméret: %.1f MB\n" - -#~ msgid "Proceed with upgrade? [Y/n] " -#~ msgstr "Kezdõdhet a frissítés? [I/n] " - -#~ msgid "failed to allocated %d bytes\n" -#~ msgstr "nem sikerült allokálni %d bájtot\n" - -#~ msgid "config: new section '%s'\n" -#~ msgstr "beÃ¡llÃtÃ¡sok: Ãºj szekciÃ³ '%s'\n" - -#~ msgid "config: line %d: bad section name\n" -#~ msgstr "beÃ¡llÃtÃ¡sok: %d. sor: rossz szekciÃ³nÃ©v\n" - -#~ msgid "" -#~ "config: line %d: '%s' is reserved and cannot be used as a package tree\n" -#~ msgstr "" -#~ "beÃ¡llÃtÃ¡sok: %d. sor: a '%s' nÃ©v fenntartott Ã©s nem hasznÃ¡lhatÃ³ " -#~ "csomagfa nÃ©vkÃ©nt\n" - -#~ msgid "config: line %d: syntax error\n" -#~ msgstr "beÃ¡llÃtÃ¡sok: %d. sor: szintaktikai hiba\n" - -#~ msgid "config: line %d: all directives must belong to a section\n" -#~ msgstr "" -#~ "beÃ¡llÃtÃ¡sok: %d. sor: minden direktÃvÃ¡nak egy szekciÃ³hoz kell " -#~ "tartoznia\n" - -#~ msgid "config: nopassiveftp\n" -#~ msgstr "beÃ¡llÃtÃ¡sok: nem lesz passzÃv ftp\n" - -#~ msgid "failed to set option USESYSLOG (%s)\n" -#~ msgstr "nem sikerÃŒlt beÃ¡llÃtani a USESYSLOG opciÃ³t (%s)\n" - -#~ msgid "config: usesyslog\n" -#~ msgstr "beÃ¡llÃtÃ¡sok: syslog hasznÃ¡lata\n" - -#~ msgid "config: including %s\n" -#~ msgstr "beÃ¡llÃtÃ¡sok: a %s beolvasÃ¡sa\n" - -#~ msgid "failed to set option NOUPGRADE (%s)\n" -#~ msgstr "nem sikerÃŒlt beÃ¡llÃtani a NOUPGRADE opciÃ³t (%s)\n" - -#~ msgid "config: noupgrade: %s\n" -#~ msgstr "beÃ¡llÃtÃ¡sok: nem fog frissÃŒlni: %s\n" - -#~ msgid "failed to set option NOEXTRACT (%s)\n" -#~ msgstr "nem sikerÃŒlt beÃ¡llÃtani a NOEXTRACT opciÃ³t (%s)\n" - -#~ msgid "config: noextract: %s\n" -#~ msgstr "beÃ¡llÃtÃ¡sok: nem lesz kifejtve: %s\n" - -#~ msgid "config: ignorepkg: %s\n" -#~ msgstr "beÃ¡llÃtÃ¡sok: a %s csomag figyelmen kÃvÃŒl hagyÃ¡sa\n" - -#~ msgid "config: holdpkg: %s\n" -#~ msgstr "beÃ¡llÃtÃ¡sok: ez a csomag mindenkÃ©pp meg lesz tartva: %s\n" - -#~ msgid "config: dbpath: %s\n" -#~ msgstr "beÃ¡llÃtÃ¡sok: adatbÃ¡zis Ãºtvonala: %s\n" - -#~ msgid "config: cachedir: %s\n" -#~ msgstr "beÃ¡llÃtÃ¡sok: gyorsÃtÃ³tÃ¡r kÃ¶nyvtÃ¡ra: %s\n" - -#~ msgid "config: log file: %s\n" -#~ msgstr "beÃ¡llÃtÃ¡sok: naplÃ³fÃ¡jl: %s\n" - -#~ msgid "config: xfercommand: %s\n" -#~ msgstr "beÃ¡llÃtÃ¡sok: Ã¡tviteli parancs: %s\n" - -#~ msgid "config: UpgradeDelay: %i\n" -#~ msgstr "beÃ¡llÃtÃ¡sok: frissÃtÃ©s kÃ©sleltetÃ©se: %i\n" - -#~ msgid "failed to set option UPGRADEDELAY (%s)\n" -#~ msgstr "nem sikerÃŒlt beÃ¡llÃtani az UPGRADEDELAY opciÃ³t (%s)\n" - -#~ msgid "" -#~ "Warning: UpgradeDelay is very high.\n" -#~ "If a package is updated often it will never be upgraded.\n" -#~ "Manually update such packages or use a lower value to avoid this " -#~ "problem.\n" -#~ msgstr "" -#~ "FigyelmeztetÃ©s: az UpgradeDelay opciÃ³ tÃºl nagy Ã©rtÃ©ken van.\n" -#~ "Ha egy csomag gyakran frissÃŒl, soha nem lesz frissÃtve.\n" -#~ "FrissÃtse kÃ©zzel ezeket a csomagokat vagy hasznÃ¡ljon egy kisebb " -#~ "Ã©rtÃ©ket, hogy elkerÃŒlje ezt a problÃ©mÃ¡t.\n" - -#~ msgid "config: line %d: bad server location\n" -#~ msgstr "beÃ¡llÃtÃ¡sok: %d. sor: rossz szerver hely\n" - -#~ msgid "config: proxyserver: %s\n" -#~ msgstr "beÃ¡llÃtÃ¡sok: proxyszerver: %s\n" - -#~ msgid "config: proxyport: %u\n" -#~ msgstr "beÃ¡llÃtÃ¡sok: proxyport: %u\n" - -#~ msgid "could not allocate %d bytes\n" -#~ msgstr "nem sikerÃŒlt allokÃ¡lni %d bÃ¡jtot\n" - -#~ msgid "config: line %d: protocol %s is not supported\n" -#~ msgstr "beÃ¡llÃtÃ¡sok: %d. sor: a %s protokoll nem tÃ¡mogatott\n" - -#~ msgid "config: %s: server: %s %s %s\n" -#~ msgstr "beÃ¡llÃtÃ¡sok: %s: szerver: %s %s %s\n" - -#~ msgid "connecting to %s:21\n" -#~ msgstr "kapcsolÃ³dÃ¡s a %s:21-hez\n" - -#~ msgid "cannot connect to %s\n" -#~ msgstr "nem sikerÃŒlt kapcsolÃ³dni ide: %s\n" - -#~ msgid "anonymous login failed\n" -#~ msgstr "a nÃ©vtelen bejelentkezÃ©s sikertelen\n" - -#~ msgid "could not cwd to %s: %s\n" -#~ msgstr "nem sikerÃŒlt kÃ¶nyvtÃ¡rt vÃ¡ltani a %s cÃme: %s\n" - -#~ msgid "failed to set passive mode\n" -#~ msgstr "nem sikerÃŒlt beÃ¡llÃtani a passzÃv mÃ³dot\n" - -#~ msgid "FTP passive mode not set\n" -#~ msgstr "az FTP passÃv mÃ³d nem lett beÃ¡llÃtva\n" - -#~ msgid "connecting to %s\n" -#~ msgstr "kapcsolÃ³dÃ¡s ide: %s\n" - -#~ msgid "connecting to %s:%u\n" -#~ msgstr "kapcsolÃ³dÃ¡s ide: %s:%u\n" - -#~ msgid "could not chdir to %s\n" -#~ msgstr "nem sikerÃŒlt kÃ¶nyvtÃ¡rat vÃ¡ltani ide: %s\n" - -#~ msgid "running command: %s\n" -#~ msgstr "parancs futtatÃ¡sa: %s\n" - -#~ msgid "running XferCommand: fork failed!\n" -#~ msgstr "XferCommand futtatÃ¡sa: a fork nem sikerÃŒlt!\n" - -#~ msgid "XferCommand command returned non-zero status code (%d)\n" -#~ msgstr "az XferCommand parancs nem-0 stÃ¡tuszkÃ³ddal tÃ©rt vissza (%d)\n" - -#~ msgid "failed to get filesize for %s\n" -#~ msgstr "nem sikerÃŒlt megkapni a %s fÃ¡jlmÃ©retÃ©t\n" - -#~ msgid "failed to get mtime for %s\n" -#~ msgstr "nem sikerÃŒlt megkapni a %s mÃ³dosÃtÃ¡si dÃ¡tumÃ¡t\n" - -#~ msgid "mtimes are identical, skipping %s\n" -#~ msgstr "a mÃ³dosÃtÃ¡si dÃ¡tumok egyeznek, a %s kihagyÃ¡sa\n" - -#~ msgid "failed to resume download -- restarting\n" -#~ msgstr "nem sikerÃŒlt folytatni a letÃ¶ltÃ©st -- ÃºjrakezdÃ©s\n" - -#~ msgid "" -#~ "\n" -#~ "failed downloading %s from %s: %s\n" -#~ msgstr "" -#~ "\n" -#~ "nem sikerÃŒlt letÃ¶lteni a %s-et a %s-rÃ³l: %s\n" - -#~ msgid "copying %s to %s/%s\n" -#~ msgstr "a %s mÃ¡solÃ¡sa ide: %s/%s\n" - -#~ msgid "failed copying %s\n" -#~ msgstr "nem sikerÃŒlt mÃ¡solni a kÃ¶vetkezÅt: %s\n" - -#~ msgid " %s is already in the current directory\n" -#~ msgstr " %s mÃ¡r a jelenlegi kÃ¶nyvtÃ¡rban van\n" - -#~ msgid "failed to download %s\n" -#~ msgstr "nem sikerÃŒlt letÃ¶lteni: %s\n" - -#~ msgid "failed to set option CACHEDIR (%s)\n" -#~ msgstr "nem sikerÃŒlt beÃ¡llÃtani a CACHEDIR opciÃ³t (%s)\n" - -#~ msgid "failed to get lastupdate time for %s (no big deal)\n" -#~ msgstr "" -#~ "nem sikerÃŒlt megkapni az utolsÃ³ mÃ³dosÃtÃ¡si idÅpontjÃ¡t a " -#~ "kÃ¶vetkezÅnek: %s (nincs sok esÃ©ly)\n" - -#~ msgid "sync: new mtime for %s: %s\n" -#~ msgstr "szinkronizÃ¡lÃ¡s: Ãºj mÃ³dosÃtÃ¡si dÃ¡tum a %s szÃ¡mÃ¡ra: %s\n" - -#~ msgid "%s-%s-%s%s is already in the cache\n" -#~ msgstr "%s-%s-%s%s mÃ¡r a gyorsÃtÃ³tÃ¡rban\n" - -#~ msgid "no %s cache exists. creating...\n" -#~ msgstr "nem lÃ©tezik a %s gyorsÃtÃ³tÃ¡r. lÃ©trehozÃ¡s...\n" - -#~ msgid "warning: no %s cache exists. creating..." -#~ msgstr "figyelmeztetÃ©s: nem lÃ©tezik a %s gyorsÃtÃ³tÃ¡r. lÃ©trehozÃ¡s..." - -#~ msgid "couldn't create package cache, using /tmp instead\n" -#~ msgstr "" -#~ "nem sikerÃŒlt lÃ©trehozni a csomag-gyorsÃtÃ³tÃ¡rat, a /tmp hasznÃ¡lata\n" - -#~ msgid "warning: couldn't create package cache, using /tmp instead" -#~ msgstr "" -#~ "figyelmeztetÃ©s: nem sikerÃŒlt lÃ©trehozni a csomag-gyorsÃtÃ³tÃ¡rat, a /" -#~ "tmp hasznÃ¡lata" - -#~ msgid "failed to retrieve some files from %s\n" -#~ msgstr "nem sikerÃŒlt letÃ¶lteni nÃ©hÃ¡ny fÃ¡jlt a %s repÃ³bÃ³l\n"

1 0

[pacman-dev] rankmirrors update: better keyboardinterrupt handling
by James Rosten 12 Mar '07

12 Mar '07

This takes care of a TODO in rankmirrors script. Now when a keyboard interrupt is raised instead of exiting immediately, it will print out the servers it has already timed and then exit. Patch is below. ~ Jamie / yankees26 Signed-off-by: James Rosten <seinfeld90(a)gmail.com> --- pacman.orig/scripts/rankmirrors 2007-03-06 18:58:48.000000000 -0500 +++ pacman/scripts/rankmirrors 2007-03-11 20:15:56.000000000 -0400 @@ -23,30 +23,28 @@ import os, sys, datetime, time, socket, urllib2 from optparse import OptionParser -# TODO: handle KeyboardInterrupt better, print list of already timed -# servers and then exit. Easier if program is function-ized. - def createOptParser(): usage = "usage: %prog [options] MIRRORFILE | URL" description = "Ranks pacman mirrors by their connection and opening " \ - "speed. Pacman mirror files are located in /etc/pacman.d/. It " \ - "can also rank one mirror if the URL is provided." + "speed. Pacman mirror files are located in /etc/pacman.d/."\ + " It can also rank one mirror if the URL is provided." parser = OptionParser(usage = usage, description = description) parser.add_option("-n", type = "int", dest = "num", default = 0, - help = "number of servers to output, 0 for all") + help = "number of servers to output, 0 for all") parser.add_option("-t", "--times", action = "store_true", - dest = "times", default = False, - help = "only output mirrors and their response times") + dest = "times", default = False, + help = "only output mirrors and their response times") parser.add_option("-u", "--url", action = "store_true", dest = "url", - default=False, help="test a specific url") + default = False, help = "test a specific url") parser.add_option("-v", "--verbose", action = "store_true", - dest = "verbose", default = False, help ="be verbose in output") + dest = "verbose", default = False, + help = "be verbose in ouptut") return parser def timeCmd(cmd): - before = time.time(); + before = time.time() try: - cmd(); + cmd() except KeyboardInterrupt, ki: raise ki except socket.timeout, ioe: @@ -63,10 +61,44 @@ return lambda : talkToServer(serverUrl) def cmpPairBySecond(p1, p2): - if p1[1] == p2[1]: return 0 - if p1[1] < p2[1]: return -1 + if p1[1] == p2[1]: + return 0 + if p1[1] < p2[1]: + return -1 return 1 +def printResults(servers, time, verbose, num): + items = servers.items() + items.sort(cmpPairBySecond) + itemsLen = len(items) + numToShow = num + if numToShow == 0: + numToShow = itemsLen + if itemsLen > 0 and itemsLen >= numToShow: + if time: + print + print ' Servers sorted by time (seconds):' + for i in items[0:numToShow]: + try: + print i[0], ':', "%.2f" % i[1] + except: + print i[0], ':', i[1] + else: + for i in items[0:numToShow]: + print 'Server =', i[0] + elif itemsLen > 0 and itemsLen <= numToShow: + if time: + print + print ' Servers sorted by time (seconds):' + for i in items: + try: + print "%.2f" % i[0], ':', i[1] + except: + print i[0], ':', i[1] + else: + for i in items: + print ' Server =', i[0] + if __name__ == "__main__": parser = createOptParser() (options, args) = parser.parse_args() @@ -81,12 +113,24 @@ if options.url: if options.verbose: print 'Testing', args[0] + '...' - serverToTime = timeCmd(getFuncToTime(args[0])) - print args[0], ':', serverToTime + try: + serverToTime = timeCmd(getFuncToTime(args[0])) + except KeyboardInterrupt, ki: + raise ki + except socket.timeout, ioe: + print >>sys.stderr, 'Connection to', args[0], 'timed out.' + sys.exit(1) + except Exception, e: + print >>sys.stderr, args[0], 'could not be reached.' + sys.exit(1) + try: + print args[0], ':', "%.2f" % serverToTime + except: + print args[0], ':', serverToTime sys.exit(0) if not os.path.isfile(args[0]): - print 'file', args[0], 'does not exist.' + print >>sys.stderr, 'rankmirrors:', args[0], 'does not exist.' sys.exit(1) fl = open(args[0], 'r') @@ -104,36 +148,28 @@ continue serverUrl = splitted[1].strip() - if serverUrl[-1] == '\n': serverUrl = serverUrl[0:-1] + if serverUrl[-1] == '\n': + serverUrl = serverUrl[0:-1] if options.verbose and options.times: - print serverUrl,'...', + print serverUrl, '...', elif options.verbose: - print '#',serverUrl,'...', + print '#', serverUrl, '...', elif options.times: print ' * ', sys.stdout.flush() - serverToTime[serverUrl] = timeCmd(getFuncToTime(serverUrl)) - if options.verbose: - try: - print "%.2f" % serverToTime[serverUrl] - except: - print serverToTime[serverUrl] - - items = serverToTime.items() - items.sort(cmpPairBySecond) - numToShow = int(options.num) - if numToShow == 0: numToShow = len(items) - if len(items) > 0: - if options.times: - print - print ' Servers sorted by time (seconds):' - for i in items[0:numToShow]: + try: + serverToTime[serverUrl] = timeCmd(getFuncToTime(serverUrl)) + if options.verbose: try: - print "%.2f" % i[1], ':', i[0] + print "%.2f" % serverToTime[serverUrl] except: - print i[1], ':', i[0] - else: - for i in items[0:numToShow]: - print 'Server =', i[0] + print serverToTime[serverUrl] + except: + print + printResults(serverToTime, options.times, options.verbose, + options.num) + sys.exit(0) + + printResults(serverToTime, options.times, options.verbose, options.num) # vim: set ts=4 sw=4 et:

1 0

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

11 Mar '07

Date: Sunday, March 11, 2007 @ 17:32:59 Author: dan Path: /home/cvs-pacman/pacman-lib/src/pacman/po Modified: hu.po (1.9 -> 1.10) * Updated Hungarian translation, thanks! (Because we are in a string freeze, I did not add "to the transaction" to the original string but kept it in your translation) Nagy Gabor <ngaba(a)petra.hos.u-szeged.hu> -------+ hu.po | 382 ++++++++++++++++++++++++++++++---------------------------------- 1 file changed, 180 insertions(+), 202 deletions(-) Index: pacman-lib/src/pacman/po/hu.po diff -u pacman-lib/src/pacman/po/hu.po:1.9 pacman-lib/src/pacman/po/hu.po:1.10 --- pacman-lib/src/pacman/po/hu.po:1.9 Wed Mar 7 11:57:23 2007 +++ pacman-lib/src/pacman/po/hu.po Sun Mar 11 17:32:59 2007 @@ -1,4 +1,3 @@ -# translation of hu.po to Hungarian # Hungarian 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. @@ -8,9 +7,9 @@ msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" -"POT-Creation-Date: 2007-03-07 11:45-0500\n" +"POT-Creation-Date: 2007-03-11 16:46+0100\n" "PO-Revision-Date: 2006-09-03 13:52+0200\n" -"Last-Translator: Miklos Vajna <vmiklos(a)frugalware.org>\n" +"Last-Translator: Nagy Gabor <ngaba(a)petra.hos.u-szeged.hu>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" @@ -30,10 +29,10 @@ msgid "loading package data... " msgstr "csomag adatainak betöltése... " -#: src/pacman/add.c:83 -#, fuzzy, c-format +#: src/pacman/add.c:83 src/pacman/remove.c:92 +#, c-format msgid "failed to add target '%s' (%s)" -msgstr "nem sikerült a '%s' célt hozzáadni (%s)\n" +msgstr "nem sikerült a '%s' célt hozzáadni a tranzakcióhoz (%s)\n" #: src/pacman/add.c:88 src/pacman/sync.c:196 src/pacman/trans.c:73 #: src/pacman/trans.c:80 src/pacman/trans.c:84 src/pacman/trans.c:94 @@ -58,14 +57,14 @@ msgstr ":: %s: ütközik a következõvel: %s" #: src/pacman/add.c:134 src/pacman/sync.c:709 -#, fuzzy, c-format +#, c-format msgid "%s exists in both '%s' and '%s'\n" -msgstr "%s%s: létezik ebben: \"%s\" (cél) és ebben: \"%s\" (cél)" +msgstr "%s létezik ebben: '%s' és ebben: '%s'\n" #: src/pacman/add.c:140 src/pacman/sync.c:715 -#, fuzzy, c-format +#, c-format msgid "%s: %s exists in filesystem\n" -msgstr "%s: a %s%s létezik a fájlrendszerben" +msgstr "%s: %s létezik a fájlrendszerben\n" #: src/pacman/add.c:146 src/pacman/sync.c:721 src/pacman/sync.c:727 msgid "" @@ -91,7 +90,7 @@ msgid "failed to release transaction (%s)\n" msgstr "nem sikerült lezárni a tranzakciót (%s)\n" -#: src/pacman/deptest.c:86 +#: src/pacman/deptest.c:84 #, c-format msgid "requires: %s" msgstr "igényli a következõt: %s" @@ -133,14 +132,12 @@ msgstr "figyelmeztetés" #: src/pacman/package.c:60 -#, fuzzy msgid "Explicitly installed" -msgstr "Kézzel telepítve\n" +msgstr "Kézzel telepítve" #: src/pacman/package.c:63 -#, fuzzy msgid "Installed as a dependency for another package" -msgstr "Függõségként lett telepítve egy másik csomag miatt\n" +msgstr "Egy másik csomag függõségeként lett telepítve" #: src/pacman/package.c:66 src/pacman/package.c:90 msgid "Unknown" @@ -148,90 +145,90 @@ #: src/pacman/package.c:70 src/pacman/package.c:121 msgid "Description : " -msgstr "Leírás : " +msgstr "Leírás : " #: src/pacman/package.c:73 src/pacman/package.c:127 #, c-format msgid "Name : %s\n" -msgstr "Név : %s\n" +msgstr "Név : %s\n" #: src/pacman/package.c:74 src/pacman/package.c:128 #, c-format msgid "Version : %s\n" -msgstr "Verzió : %s\n" +msgstr "Verzió : %s\n" #: src/pacman/package.c:75 -#, fuzzy, c-format +#, c-format msgid "URL : %s\n" -msgstr "Név : %s\n" +msgstr "URL : %s\n" #: src/pacman/package.c:76 msgid "License :" -msgstr "Licenc :" +msgstr "Licenc :" #: src/pacman/package.c:77 src/pacman/package.c:129 msgid "Groups :" -msgstr "Csoportok :" +msgstr "Csoportok :" #: src/pacman/package.c:78 src/pacman/package.c:130 msgid "Provides :" -msgstr "Szolgáltatja :" +msgstr "Szolgáltatja :" #: src/pacman/package.c:79 src/pacman/package.c:131 msgid "Depends On :" -msgstr "Függ :" +msgstr "Függ :" #: src/pacman/package.c:80 src/pacman/package.c:132 msgid "Removes :" -msgstr "Eltávolítja :" +msgstr "Eltávolítja :" #: src/pacman/package.c:83 msgid "Required By :" -msgstr "Igényli :" +msgstr "Igényli :" #: src/pacman/package.c:85 src/pacman/package.c:133 msgid "Conflicts With :" -msgstr "Ütközik :" +msgstr "Ütközik :" -#: src/pacman/package.c:86 -#, fuzzy, c-format -msgid "Installed Size : %ld K\n" -msgstr "Telepítõ szkript:%s\n" +#: src/pacman/package.c:86 src/pacman/package.c:136 +#, c-format +msgid "Installed Size : %6.2f K\n" +msgstr "Helyfoglalás : %6.2f K\n" #: src/pacman/package.c:87 #, c-format msgid "Packager : %s\n" -msgstr "Csomagoló : %s\n" +msgstr "Csomagoló : %s\n" #: src/pacman/package.c:88 #, c-format msgid "Architecture : %s\n" -msgstr "Architektúra : %s\n" +msgstr "Architektúra : %s\n" #: src/pacman/package.c:89 #, c-format msgid "Build Date : %s %s\n" -msgstr "Fordítás ideje : %s %s\n" +msgstr "Fordítás ideje : %s %s\n" #: src/pacman/package.c:90 #, c-format msgid "Build Type : %s\n" -msgstr "Fordítás Típusa: %s\n" +msgstr "Fordítás Típusa : %s\n" #: src/pacman/package.c:92 #, c-format msgid "Install Date : %s %s\n" -msgstr "Telepítés ideje: %s %s\n" +msgstr "Telepítés ideje : %s %s\n" #: src/pacman/package.c:93 -#, fuzzy, c-format +#, c-format msgid "Install Reason : %s\n" -msgstr "Telepítõ szkript:%s\n" +msgstr "Telepítés oka : %s\n" #: src/pacman/package.c:95 #, c-format msgid "Install Script : %s\n" -msgstr "Telepítõ szkript:%s\n" +msgstr "Telepítõ szkript: %s\n" #: src/pacman/package.c:96 msgid "Yes" @@ -242,58 +239,48 @@ msgstr "Nem" #: src/pacman/package.c:126 -#, fuzzy, c-format +#, c-format msgid "Repository : %s\n" -msgstr "Repó : %s\n" +msgstr "Repó : %s\n" #: src/pacman/package.c:134 -#, fuzzy msgid "Replaces :" -msgstr "Lecseréli :" +msgstr "Lecseréli :" #: src/pacman/package.c:135 #, c-format msgid "Download Size : %6.2f K\n" -msgstr "" - -#: src/pacman/package.c:136 -#, fuzzy, c-format -msgid "Installed Size : %6.2f K\n" -msgstr "Telepítõ szkript:%s\n" +msgstr "Tömörített méret: %6.2f K\n" #: src/pacman/package.c:144 -#, fuzzy, c-format +#, c-format msgid "MD5 Sum : %s" -msgstr "" -"\n" -"MD5 Sum : %s" +msgstr "MD5 Sum : %s" #: src/pacman/package.c:147 -#, fuzzy, c-format +#, c-format msgid "SHA1 Sum : %s" -msgstr "" -"\n" -"SHA1 Sum : %s" +msgstr "SHA1 Sum : %s" #: src/pacman/package.c:158 #, c-format msgid "Backup Files:\n" -msgstr "" +msgstr "Backup fájlok:\n" #: src/pacman/package.c:180 -#, fuzzy, c-format +#, c-format msgid "error calculating checksums for %s\n" -msgstr "hiba a %s md5 vagy sha1 ellenõrzõ összegének számítása közben\n" +msgstr "hiba a %s ellenõrzõ összegének számítása közben\n" #: src/pacman/package.c:193 -#, fuzzy, c-format +#, c-format msgid "MODIFIED\t%s\n" -msgstr "%sMÓDOSÍTVA\t%s\n" +msgstr "MÓDOSÍTVA\t%s\n" #: src/pacman/package.c:195 #, c-format msgid "Not Modified\t%s\n" -msgstr "" +msgstr "Nem módosítva\t%s\n" #: src/pacman/package.c:200 #, c-format @@ -301,9 +288,9 @@ msgstr "HIÁNYZIK\t\t%s\n" #: src/pacman/package.c:206 -#, fuzzy, c-format +#, c-format msgid "(none)\n" -msgstr "Nincs\n" +msgstr "(nincs)\n" #: src/pacman/package.c:246 #, c-format @@ -333,7 +320,7 @@ #: src/pacman/pacman.c:94 #, c-format msgid " %s {-Q --query} [options] [package]\n" -msgstr " %s {-Q --query} [opciók] <csomag>\n" +msgstr " %s {-Q --query} [opciók] [csomag]\n" #: src/pacman/pacman.c:95 #, c-format @@ -372,15 +359,15 @@ #: src/pacman/pacman.c:103 src/pacman/pacman.c:109 src/pacman/pacman.c:120 #: src/pacman/pacman.c:140 -#, fuzzy, c-format +#, c-format msgid " -d, --nodeps skip dependency checks\n" -msgstr " -d, --nodeps függõségi ellenõrzések kihagyása\n" +msgstr " -d, --nodeps függõségi ellenõrzések kihagyása\n" #: src/pacman/pacman.c:104 src/pacman/pacman.c:121 src/pacman/pacman.c:142 -#, fuzzy, c-format +#, c-format msgid " -f, --force force install, overwrite conflicting files\n" msgstr "" -" -f, --force a telepítés eröltetése, ütközõ fájlok felülírása\n" +" -f, --force a telepítés erõltetése, ütközõ fájlok felülírása\n" #: src/pacman/pacman.c:106 #, c-format @@ -388,32 +375,30 @@ msgstr "usage: %s {-R --remove} [opciók] <csomag>\n" #: src/pacman/pacman.c:108 -#, fuzzy, c-format +#, c-format msgid "" " -c, --cascade remove packages and all packages that depend on them\n" msgstr "" -" -c, --cascade a csomagok és az õket igénylõ csomagok eltávolítása\n" +" -c, --cascade a csomagok és az õket igénylõ csomagok eltávolítása\n" #: src/pacman/pacman.c:110 -#, fuzzy, c-format +#, c-format msgid "" " -k, --dbonly only remove database entry, do not remove files\n" msgstr "" -" -k, --dbonly csak az adatbázis-bejegyzés eltávolítása, magukat a " -"fájlokat ne\n" +" -k, --dbonly csak az adatbázis-bejegyzést törölje, a fájlokat ne\n" #: src/pacman/pacman.c:111 -#, fuzzy, c-format +#, c-format msgid " -n, --nosave remove configuration files as well\n" -msgstr " -n, --nosave a beállítási fájlokat is törölje\n" +msgstr " -n, --nosave a beállítási fájlokat is törölje\n" #: src/pacman/pacman.c:112 -#, fuzzy, c-format +#, c-format msgid "" " -s, --recursive remove dependencies also (that won't break packages)\n" msgstr "" -" -s, --recursive a függõségeket is távolítsa el (nem fogja a csomagokat " -"tönkretenni)\n" +" -s, --recursive a függõségeket is távolítsa el (melyeknél ez biztonságos)\n" #: src/pacman/pacman.c:115 #, c-format @@ -431,72 +416,73 @@ msgstr "használat: %s {-Q --query} [opciók] [csomag]\n" #: src/pacman/pacman.c:125 -#, fuzzy, c-format +#, c-format msgid " -c, --changelog view the changelog of a package\n" -msgstr " -c, --changelog a változások naplójának megtekintése\n" +msgstr " -c, --changelog a változások naplójának megtekintése\n" #: src/pacman/pacman.c:126 -#, fuzzy, c-format +#, c-format msgid "" " -e, --orphans list all packages installed as dependencies but no " "longer\n" msgstr "" -" -e, --orphans az összes olyan csomag listázása amely függõségként " -"került telepítésre\n" +" -e, --orphans azon csomagok listázása, amelyek függõségként " +"kerültek\n" #: src/pacman/pacman.c:127 -#, fuzzy, c-format +#, c-format msgid " required by any package\n" -msgstr " és már nem igénylt más csomagok által\n" +msgstr " telepítésre, de most már nem igényli õket más csomag\n" #: src/pacman/pacman.c:128 src/pacman/pacman.c:143 -#, fuzzy, c-format +#, c-format msgid " -g, --groups view all members of a package group\n" -msgstr " -g, --groups egy csoport összes tagjának megtekintése\n" +msgstr " -g, --groups egy csoport összes tagjának megtekintése\n" #: src/pacman/pacman.c:129 src/pacman/pacman.c:144 -#, fuzzy, c-format +#, c-format msgid " -i, --info view package information\n" -msgstr " -i, --info csomaginformációk megtekintése\n" +msgstr " -i, --info csomaginformációk megtekintése\n" #: src/pacman/pacman.c:130 -#, fuzzy, c-format +#, c-format msgid " -l, --list list the contents of the queried package\n" -msgstr " -l, --list a lekérdezett csomag tartalmának listázása\n" +msgstr " -l, --list a lekérdezett csomag tartalmának listázása\n" #: src/pacman/pacman.c:131 -#, fuzzy, c-format +#, c-format msgid "" " -m, --foreign list all packages that were not found in the sync db" "(s)\n" msgstr "" -" -m, --foreign az összes olyan csomag listázása amely a távoli " -"adatbázis(ok)bannem volt megtalálható\n" +" -m, --foreign a távoli repókban nem talált telepített " +"csomagok listája\n" #: src/pacman/pacman.c:132 -#, fuzzy, c-format +#, c-format msgid " -o, --owns <file> query the package that owns <file>\n" -msgstr " -o, --owns <fájl> a <fájl>-t tartalmazó csomag lekérdezése\n" +msgstr " -o, --owns <fájl> a <fájl>-t tartalmazó csomag lekérdezése\n" #: src/pacman/pacman.c:133 -#, fuzzy, c-format +#, c-format msgid "" " -p, --file query the package file [package] instead of the " "database\n" msgstr "" -" -p, --file a pacman a [csomag] csomagfájlt kérdezze le ahelyett,\n" +" -p, --file <csomag> a <csomag> csomagfájl lekérdezése az adatbázis helyett\n" #: src/pacman/pacman.c:134 -#, fuzzy, c-format +#, c-format msgid "" " -s, --search search locally-installed packages for matching " "strings\n" -msgstr " -s, --search keresés a helyileg telepített csomagok között\n" +msgstr "" +" -s, --search [regex] keresés a telepített csomagok között\n" #: src/pacman/pacman.c:135 -#, fuzzy, c-format +#, c-format msgid " -u, --upgrades list all packages that can be upgraded\n" -msgstr " -u, --sysupgrade az összes elavult csomag frissítése\n" +msgstr " -u, --upgrades az összes frissíthetõ csomag listázása\n" #: src/pacman/pacman.c:137 #, c-format @@ -504,111 +490,112 @@ msgstr "használat: %s {-S --sync} [opciók] [csomag]\n" #: src/pacman/pacman.c:139 -#, fuzzy, c-format +#, c-format msgid "" " -c, --clean remove old packages from cache directory (-cc for " "all)\n" msgstr "" -" -c, --clean a régi csomagok eltávolítása a gyorsítótár " -"könyvtárából (használja a '-cc'-t az összeshez)\n" +" -c, --clean a régi csomagok törlése a gyorsítótárkönyvtárból\n" +" (használja a '-cc'-t az összeshez)\n" #: src/pacman/pacman.c:141 -#, fuzzy, c-format +#, c-format msgid " -e, --dependsonly install dependencies only\n" -msgstr " -e, --dependsonly csak a függõségek telepítése\n" +msgstr " -e, --dependsonly csak a függõségek telepítése\n" #: src/pacman/pacman.c:145 -#, fuzzy, c-format +#, c-format msgid "" " -p, --print-uris print out URIs for given packages and their " "dependencies\n" msgstr "" -" -p, --print-uris kinyomtatja az adott csomagok es függõségeik URI-it\n" +" -p, --print-uris listázza az adott csomagok és függõségeik URI-jait\n" #: src/pacman/pacman.c:146 -#, fuzzy, c-format +#, c-format msgid "" " -s, --search search remote repositories for matching strings\n" -msgstr " -s, --search keresés a távoli csomagadatbázisban\n" +msgstr "" +" -s, --search [regex] keresés a távoli csomagadatbázisokban\n" #: src/pacman/pacman.c:147 -#, fuzzy, c-format +#, c-format msgid " -u, --sysupgrade upgrade all packages that are out of date\n" -msgstr " -u, --sysupgrade az összes elavult csomag frissítése\n" +msgstr " -u, --sysupgrade az összes elavult csomag frissítése\n" #: src/pacman/pacman.c:148 -#, fuzzy, c-format +#, c-format msgid "" " -w, --downloadonly download packages but do not install/upgrade " "anything\n" -msgstr " -w, --downloadonly csak letöltés, de semmit nem telepít/frissít\n" +msgstr "" +" -w, --downloadonly csak letöltés, de semmit nem telepít/frissít\n" #: src/pacman/pacman.c:149 -#, fuzzy, c-format +#, c-format msgid "" " -y, --refresh download fresh package databases from the server\n" -msgstr " -y, --refresh friss csomagadatbázis letöltése a szerverrõl\n" +msgstr "" +" -y, --refresh friss csomagadatbázis letöltése a szerverrõl\n" #: src/pacman/pacman.c:150 -#, fuzzy, c-format +#, c-format msgid "" " --ignore <pkg> ignore a package upgrade (can be used more than " "once)\n" msgstr "" -" --ignore <csomag> egy csomag frissítésének figyelmen kívül hagyása " -"(többször is használható)\n" +" --ignore <csom.> csomagfrissítés mellõzése (többször is használható)\n" #: src/pacman/pacman.c:152 -#, fuzzy, c-format +#, c-format msgid " --config <path> set an alternate configuration file\n" -msgstr " --config <útvonal> alternatív konfigurációs fájl használata\n" +msgstr " --config <útv.> alternatív konfigurációs fájl használata\n" #: src/pacman/pacman.c:153 -#, fuzzy, c-format +#, c-format msgid " --noconfirm do not ask for anything confirmation\n" -msgstr " --noconfirm ne kérjen soha megerõsítést\n" +msgstr " --noconfirm ne kérjen soha megerõsítést\n" #: src/pacman/pacman.c:154 -#, fuzzy, c-format +#, c-format msgid "" " --ask <number> pre-specify answers for questions (see manpage)\n" msgstr "" -" --ask <szám> elõre megadja a válaszokat kérdésekre (ld. man oldal)\n" +" --ask <szám> elõre megadja a válaszokat kérdésekre (ld. man oldal)\n" #: src/pacman/pacman.c:155 -#, fuzzy, c-format +#, c-format msgid "" " --noprogressbar do not show a progress bar when downloading files\n" msgstr "" -" --noprogressbar ne mutasson folyamatsávot a fájlok letöltése közben\n" +" --noprogressbar ne mutasson folyamatsávot a fájlok letöltése közben\n" #: src/pacman/pacman.c:156 -#, fuzzy, c-format +#, c-format msgid "" " --noscriptlet do not execute the install scriptlet if there is any\n" msgstr "" -" --noscriptlet ne futtassa le a telepítési szkriptet ha van olyan\n" +" --noscriptlet ne futtassa le a telepítési szkriptet, ha van olyan\n" #: src/pacman/pacman.c:157 -#, fuzzy, c-format +#, c-format msgid " -v, --verbose be verbose\n" -msgstr " -v, --verbose legyen bõbeszédû\n" +msgstr " -v, --verbose legyen bõbeszédû\n" #: src/pacman/pacman.c:158 -#, fuzzy, c-format +#, c-format msgid " -r, --root <path> set an alternate installation root\n" -msgstr "" -" -r, --root <útvonal> alternatív telepítési gyökérkönyvtár beállítása\n" +msgstr " -r, --root <útvonal> alternatív telepítési gyökérkönyvtár beállítása\n" #: src/pacman/pacman.c:159 -#, fuzzy, c-format +#, c-format msgid " -b, --dbpath <path> set an alternate database location\n" -msgstr " -b, --dbpath <útvonal> alternatív adatbázis hely beállítása\n" +msgstr " -b, --dbpath <útv.> alternatív adatbáziskönyvtár beállítása\n" #: src/pacman/pacman.c:160 -#, fuzzy, c-format +#, c-format msgid " --cachedir <dir> set an alternate package cache location\n" -msgstr " -b, --dbpath <útvonal> alternatív adatbázis hely beállítása\n" +msgstr " --cachedir <kvt> alternatív csomaggyorsítótár-könyvtár beállítása\n" #: src/pacman/pacman.c:173 #, c-format @@ -622,24 +609,24 @@ msgstr " foglaltak alapján szabadon terjesztheti\n" #: src/pacman/pacman.c:299 -#, fuzzy, c-format +#, c-format msgid "'%s' is not a valid debug level" -msgstr "%s: nem érvényes reguláris kifejezés.\n" +msgstr "a '%s' nem érvényes hibakeresési szint" #: src/pacman/pacman.c:314 -#, fuzzy, c-format +#, c-format msgid "'%s' is not a valid cache directory\n" -msgstr "nem sikerült elérni a gyorsítótár könyvtárát\n" +msgstr "a '%s' nem érvényes gyorsítótárkönyvtár\n" #: src/pacman/pacman.c:332 -#, fuzzy, c-format +#, c-format msgid "'%s' is not a valid db path\n" -msgstr "%s: nem érvényes reguláris kifejezés.\n" +msgstr "a '%s' nem érvényes adatbázis útvonal\n" #: src/pacman/pacman.c:362 -#, fuzzy, c-format +#, c-format msgid "'%s' is not a valid root path\n" -msgstr "%s: nem érvényes reguláris kifejezés.\n" +msgstr "a '%s' nem érvényes gyökérkönyvtár útvonal\n" #: src/pacman/pacman.c:389 msgid "only one operation may be used at a time\n" @@ -699,13 +686,12 @@ msgstr "egyetlen használható csomag repó sincs beállítva.\n" #: src/pacman/query.c:128 -#, fuzzy msgid "Checking for package upgrades..." -msgstr "a csomagok integritásának ellenõrzése... " +msgstr "Frissítések keresése... " #: src/pacman/query.c:135 msgid "no upgrades found" -msgstr "" +msgstr "nem találtam frissítést" #: src/pacman/query.c:173 #, c-format @@ -745,15 +731,10 @@ msgid "failed to init transaction (%s)\n" msgstr "nem sikerült inicializálni a tranzakciót (%s)\n" -#: src/pacman/remove.c:92 -#, c-format -msgid "failed to add target '%s' (%s)\n" -msgstr "nem sikerült a '%s' célt hozzáadni (%s)\n" - #: src/pacman/remove.c:106 -#, fuzzy, c-format +#, c-format msgid ":: %s is required by %s\n" -msgstr " %s: igényli a %s\n" +msgstr ":: %s-t igényli a %s\n" #: src/pacman/remove.c:131 msgid "" @@ -792,9 +773,9 @@ msgstr "nem sikerült létrehozni az új gyorsítótár könyvtárát\n" #: src/pacman/sync.c:218 -#, fuzzy, c-format +#, c-format msgid "failed to synchronize %s: %s\n" -msgstr "nem sikerült szinkronizálni a következõt: %s\n" +msgstr "nem sikerült szinkronizálni %s-t: %s\n" #: src/pacman/sync.c:220 #, c-format @@ -807,17 +788,17 @@ msgstr " a %s naprakész\n" #: src/pacman/sync.c:345 -#, fuzzy, c-format +#, c-format msgid "repository '%s' does not exist\n" -msgstr "a \"%s\" repó nem található.\n" +msgstr "a '%s' repó nem létezik\n" #: src/pacman/sync.c:361 -#, fuzzy, c-format +#, c-format msgid "package '%s' was not found in repository '%s'\n" -msgstr "a \"%s\" csomag nem található.\n" +msgstr "a '%s' csomag nem található a '%s' repóban\n" #: src/pacman/sync.c:381 -#, fuzzy, c-format +#, c-format msgid "package '%s' was not found\n" msgstr "a \"%s\" csomag nem található.\n" @@ -835,14 +816,12 @@ msgstr "a csomaglisták szinkronizálása" #: src/pacman/sync.c:493 -#, fuzzy msgid "failed to synchronize any databases" -msgstr "nem sikerült szinkronizálni a következõt: %s\n" +msgstr "nem sikerült szinkronizálni valamelyik adatbázist" #: src/pacman/sync.c:499 -#, fuzzy msgid ":: Starting full system upgrade...\n" -msgstr "teljes rendszerfrissítés indítása" +msgstr ":: Teljes rendszerfrissítés indítása...\n" #: src/pacman/sync.c:500 msgid "starting full system upgrade" @@ -869,14 +848,14 @@ msgstr ":: Elõször csak a pacman frissítése? [I/n] " #: src/pacman/sync.c:537 -#, fuzzy, c-format +#, c-format msgid "pacman: %s\n" -msgstr "Egyik csomag sem tartalmazza a következõt: %s\n" +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] " @@ -888,10 +867,9 @@ msgstr ":: Telepíti a %s-t a %s csoportból? [I/n] " #: src/pacman/sync.c:603 -#, fuzzy, c-format +#, c-format msgid "'%s': not found in sync db\n" -msgstr "" -"nem sikerült hozzáadni a '%s' célt: nem található a távoli adatbázisban\n" +msgstr "'%s': nem található a távoli adatbázisban\n" #: src/pacman/sync.c:623 msgid "requires" @@ -902,9 +880,8 @@ msgstr "igényli a" #: src/pacman/sync.c:665 -#, fuzzy msgid " local database is up to date\n" -msgstr " a %s naprakész\n" +msgstr " a helyi adatbázis naprakész\n" #: src/pacman/sync.c:674 msgid "" @@ -939,9 +916,8 @@ msgstr "fájlütközések vizsgálata... " #: src/pacman/trans.c:63 -#, fuzzy msgid "cleaning up... " -msgstr "%s eltávolítása... " +msgstr "tisztogatás... " #: src/pacman/trans.c:66 msgid "resolving dependencies... " @@ -986,22 +962,19 @@ msgstr "a csomagok integritásának ellenõrzése... " #: src/pacman/trans.c:147 -#, fuzzy msgid "failed.\n" msgstr " sikertelen.\n" #: src/pacman/trans.c:154 -#, fuzzy, c-format +#, c-format msgid ":: Retrieving packages from %s...\n" -msgstr "" -"\n" -":: Csomagok letöltése a %s-bõl...\n" +msgstr ":: Csomagok letöltése a %s-bõl...\n" #: src/pacman/trans.c:175 -#, fuzzy, c-format +#, c-format msgid ":: %1$s requires %2$s from IgnorePkg. Install %2$s? [Y/n] " -msgstr "" -":: a %s igényli a %s-t, de az az IgnorePkg része. Mégis telepíti? [I/n] " +msgstr ":: %1$s igényli %2$s-t az IgnorePkg-bõl. Telepíti %2$s-t? " +"[I/n] " #: src/pacman/trans.c:180 #, c-format @@ -1051,9 +1024,8 @@ msgstr "eltávolíás:" #: src/pacman/trans.c:338 -#, fuzzy msgid "checking for file conflicts" -msgstr "fájlütközések vizsgálata... " +msgstr "fájlütközések vizsgálata" #: src/pacman/util.c:259 #, c-format @@ -1061,36 +1033,42 @@ msgstr "Nincs\n" #: src/pacman/util.c:311 -#, fuzzy msgid "Remove:" -msgstr "" -"\n" -"Eltávolítás: " +msgstr "Eltávolítás: " #: src/pacman/util.c:319 -#, fuzzy, c-format +#, c-format msgid "" "\n" "Total Removed Size: %.2f MB\n" msgstr "" "\n" -"Teljes csomagméret: %.1f MB\n" +"Teljes eltávolított méret: %.2f MB\n" #: src/pacman/util.c:330 -#, fuzzy, c-format +#, c-format msgid "" "\n" "Total Package Size: %.2f MB\n" msgstr "" "\n" -"Teljes csomagméret: %.1f MB\n" +"Teljes csomagméret: %.2f MB\n" #: src/pacman/util.c:337 -#, fuzzy, c-format +#, c-format msgid "Total Installed Size: %.2f MB\n" -msgstr "" -"\n" -"Teljes csomagméret: %.1f MB\n" +msgstr "Teljes telepített méret: %.2f MB\n" + +#, fuzzy +#~ msgid "Installed Size : %ld K\n" +#~ msgstr "Telepítõ szkript:%s\n" + +#, fuzzy +#~ msgid "could not repair 'local' database (%s)\n" +#~ msgstr "nem sikerült regisztrálni a 'local' adatbázist (%s)\n" + +#~ msgid "failed to add target '%s' (%s)\n" +#~ msgstr "nem sikerült a '%s' célt hozzáadni (%s)\n" #~ msgid "memory allocation failure\n" #~ msgstr "memória allokálási hiba\n"

1 0