summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Update simplified chinese (zh_CN) translation.甘露(Lu.Gan)2008-02-25
| | | | Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
* fix two broken translated strings.Chantry Xavier2008-02-25
| | | | | | | Using c-format on every strings allowed me two found two broken ones. One was harmless, but the other caused a segfault, as reported in FS#9658. Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
* xgettext : change pass-c-format flag to c-format.Chantry Xavier2008-02-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently xgettext apparently attempts to autodetect c format strings (eg a string with a %s) to decide whether to use c-format flag or not. If we use --flag=_:1:c-format instead of --flag=_:1:pass-c-format, the c-format will be applied everywhere. I couldn't find this documented anywhere though. But the pass prefix is mentioned here : http://www.gnu.org/software/gettext/manual/html_node/xgettext-Invocation.html#xgettext-Invocation "Specifies additional flags for strings occurring as part of the argth argument of the function word. The possible flags are the possible format string indicators, such as ‘c-format’, and their negations, such as ‘no-c-format’, possibly prefixed with ‘pass-’." And c-format is documented there : http://www.gnu.org/software/gettext/manual/html_node/c_002dformat-Flag.html#c_002dformat-Flag "This situation happens quite often. The printf function is often called with strings which do not contain a format specifier. Of course one would normally use fputs but it does happen. In this case xgettext does not recognize this as a format string but what happens if the translation introduces a valid format specifier? The printf function will try to access one of the parameters but none exists because the original code does not pass any parameters." And that's exactly what happened with FS#9658. So using c-format for every string will prevent this issue from happening again. Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
* Remove done and failed msg when loading targets.Chantry Xavier2008-02-25
| | | | | | | | | | | | | This change is similar to the one made in 3017b71cb5cde3aef7e0efb5f49843cccf759956. We had a "loading package data..." message, followed by either "failed" or "done", but it didn't take into account that other warnings / questions could be displayed between. Ref: http://archlinux.org/pipermail/pacman-dev/2008-January/010971.html Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
* libalpm/sync.c : fix poorly worded debug message.Chantry Xavier2008-02-25
| | | | Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
* Update TRANSLATORS file.Chantry Xavier2008-02-25
| | | | | | | | | | | The header of that file already stated that only current translators were listed in that file. So there is no need to mark the current translators with a star, I just removed the old ones instead (all history of that file is kept in git anyway). Current translators = all translators who contributed to 3.1.x translations. Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
* Add some NULL checks into recently modified output functionsDan McGee2008-02-24
| | | | | | | | | After a merge with master where some strings we print (such as descriptions) could be NULL, a few segfaults popped up due to strlen() calls on null pointers. Fix this by doing some preemptive checks and returning from functions early if the string was null. Signed-off-by: Dan McGee <dan@archlinux.org>
* Update Russian translationSergey Tereschenko2008-02-24
| | | | | | Some corrections from the previous translation. Signed-off-by: Dan McGee <dan@archlinux.org>
* A few more wide character output fixesDan McGee2008-02-22
| | | | | | | Fix up the indentprint and list printing functions so they work properly. This output can be seen in places such as -Ss, -Si, -Qs, and -Qi. Signed-off-by: Dan McGee <dan@archlinux.org>
* Fix wide character output for add/remove/upgrade/conflict progressDan McGee2008-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | Due to the addition of the Chinese translation, our column widths were all messed up as mentioned in the download progress commit fixing this same problem there. This is a port of the code and ideas from that fix to the installation progress bars. Once again, a handful of examples were tested to ensure we work in all locales and with varying byte and char widths. English (before & after): (1/1) checking for file conflicts [-----------------] 100% (1/1) upgrading man-pages [-----------------] 100% German (before & after): (1/1) Prüfe auf Dateikonflikte [-----------------] 100% (1/1) Aktualisiere man-pages [-----------------] 100% Chinese (before): (1/1) 正在检查文件冲突 [-----------------] 100% (1/1) 生在升级 man-pages [c o o o o o ] (1/1) 生在升级 man-pages [----------C o o ] (1/1) 生在升级 man-pages [-----------------] 100% Chinese (after): (1/1) 正在检查文件冲突 [-----------------] 100% (1/1) 生在升级 man-pages [-----------------] 100% Signed-off-by: Dan McGee <dan@archlinux.org>
* Fix wide character output for download progressDan McGee2008-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we have a Chinese translation, all of the problems with new character sets crop up. Assumptions were made in the past that all characters occupied one column, which is not true with a Chinese character set. In addition, the download code even failed on such things as 'ö', which is two bytes wide but only 1 column. This code will need to also be ported to the add/remove/upgrade/conflicts progress printouts. Note that the tests below try to incorporate a number of things: 1. download filenames too long to fit 2. download filenames cut off in the middle of a multibyte sequence 3. download filenames incorporating multicolumn chars 4. download filenames incorporating multibyte, single-column chars 5. 'plain' download filenames that have always worked Before: :: 正在同步软件包数据库…… 正在解决倚赖��... 0.0K 199.8K/s 00:00:00 [-----------------] 100% 错误:无法升级正在解决倚赖关系junköëjunköëjunköëäää (未预计的系统错误) 正在解决倚赖��... 0.0K 308.4K/s 00:00:00 [-----------------] 100% 错误:无法升级正在解决倚赖关系 (未预计的系统错误) junköëä 0.0K 390.6K/s 00:00:00 [-----------------] 100% 错误:无法升级junköëä (未预计的系统错误) pacman-git 0.5K 4.3M/s 00:00:00 [-----------------] 100% 本地数据库已是最新的 After: :: 正在同步软件包数据库…… 正在解决倚赖关系jun... 0.0K 89.7K/s 00:00:00 [-----------------] 100% 错误:无法升级正在解决倚赖关系junköëjunköëjunköëäää (未预计的系统错误) 正在解决倚赖关系 0.0K 147.7K/s 00:00:00 [-----------------] 100% 错误:无法升级正在解决倚赖关系 (未预计的系统错误) junköëä 0.0K 156.9K/s 00:00:00 [-----------------] 100% 错误:无法升级junköëä (未预计的系统错误) pacman-git 0.5K 1515.9K/s 00:00:00 [-----------------] 100% 本地数据库已是最新的 Signed-off-by: Dan McGee <dan@archlinux.org>
* Add new Simplified Chinese translation甘露(Lu.Gan)2008-02-22
| | | | | | Thanks a lot! Now we get to fix the breakage this causes in output messages. Signed-off-by: Dan McGee <dan@archlinux.org>
* Updates before 3.1.2 releaseDan McGee2008-02-20
| | | | Signed-off-by: Dan McGee <dan@archlinux.org>
* Fix two missing BUILDSCRIPT variables in makepkg.Mark Constable2008-02-20
| | | | Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
* Lock the database on -Sc operation.Chantry Xavier2008-02-19
| | | | | | | | | | This partly fixes FS#9609. Weird things could happen when running -Sc while another instance was already running. The cleancache function could delete packages that were just being downloaded. Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
* Add new sync_trans_init and sync_trans_release.Chantry Xavier2008-02-19
| | | | | | | | Factorize these two functions to avoid code duplication, especially since they could be used for locking the database during -Sc and -Sy operation too. Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
* More small updates to Spanish translationFernando Lagos2008-02-19
| | | | Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
* When cleaning DBs, only look at directoriesDan McGee2008-02-19
| | | | | | | | | | FS#9609 brought up an interesting issue where a user was prompted to remove db.lck when running a -Sc operation concurrently with an -Syu operation during a long download. Although there are other problems here, this fixes the issue where files other than directories could be considered to be databases. Fix this. Signed-off-by: Dan McGee <dan@archlinux.org>
* Final updates to Polish translationMateusz Herych2008-02-19
| | | | | | Good job on the group effort guys, thanks for getting this one complete. Signed-off-by: Dan McGee <dan@archlinux.org>
* Update pacman Russian translation.Vitaly Dolgov2008-02-18
| | | | | | | Cleaned up by Oleg Finkelshteyn. Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
* Update libalpm russian translation.Sergey Tereschenko2008-02-18
| | | | | | Cleaned up by Oleg Finkelshteyn. Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
* Do not warn about up to date package when downloading onlyAllan McRae2008-02-18
| | | | | | | | | Stops the "<pkg> is up to date -- reinstalling" message when using the download only flag. Ref: http://archlinux.org/pipermail/pacman-dev/2008-January/010952.html Signed-off-by: Allan McRae <mcrae_allan@hotmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
* Updates to Russian translationВладимир Байраковский2008-02-17
| | | | | | Note that it still is not complete. Signed-off-by: Dan McGee <dan@archlinux.org>
* scripts: allow usage when gettext is not installedDan McGee2008-02-17
| | | | | | | | | | | Address the issue of our scripts not working so great when gettext is not available. This has come up in multiple bug reports, and is relatively easy to address by adding a simple check and a stub function if gettext was not found that simply echos the original message. Addresses concerns from FS#9214 and FS#9607. Signed-off-by: Dan McGee <dan@archlinux.org>
* Fix conflict progress bar with UTF-8 charsChantry Xavier2008-02-17
| | | | | | | | | | | | | | | | | | | | This fixes FS#6437. Dan already explained the problem in that bug report. Instead of letting printf deal with the length of utf8 strings, we can handle it more explicitly in the case of conflict progress bar, just like we do for add/remove progress bars. We compute the remaining space left for displaying the pkgname in case of add/remove, and an empty string in case of conflict. Before : (1/1) Prüfe auf Dateikonflikte [###################] 100% (1/1) Aktualisiere rxvt-unicode [###################] 100% After : (1/1) Prüfe auf Dateikonflikte [###################] 100% (1/1) Aktualisiere rxvt-unicode [###################] 100% Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
* Remove reference to gnome in DOC_DIRSDan McGee2008-02-17
| | | | | | | Arch no longer installs Gnome here, and we should be stripping any doc dirs in /opt anyway, so generalize it. Fixes FS#9597. Signed-off-by: Dan McGee <dan@archlinux.org>
* Updated Spanish translation for 3.1.2 releaseJuan Pablo Gonzalez2008-02-17
| | | | Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
* Add gettext call to 2 'failed' messagesDan McGee2008-02-16
| | | | | Noticed-by: Vojtěch Gondžala <vogo@seznam.cz> Signed-off-by: Dan McGee <dan@archlinux.org>
* More small updates to German translationMatthias Gorissen2008-02-15
| | | | Signed-off-by: Dan McGee <dan@archlinux.org>
* Update Polish translationJaroslaw Swierczynski2008-02-15
| | | | Signed-off-by: Dan McGee <dan@archlinux.org>
* Merge branch 'translations' into maintDan McGee2008-02-14
|\
| * Update German translationBenjamin Andresen2008-02-14
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
| * Updated Brazilian Portuguese translation for 3.1.2 releaseJoão Felipe Santos2008-02-15
| | | | | | | | Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
| * Updated Hungarian translation for 3.1.2 releaseNagy Gabor2008-02-12
| | | | | | | | Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
| * Updated Czech translation for 3.1.2 releaseVojtěch Gondžala2008-02-12
| | | | | | | | Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
| * Updated English translation for 3.1.2 releaseJeff Bailes2008-02-12
| | | | | | | | Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
| * Update french translation.Chantry Xavier2008-02-12
| | | | | | | | | | Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
| * Updated Italian translation for 3.1.2 releaseGiovanni Scafora2008-02-12
| | | | | | | | Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
| * Update translation files in prep for 3.1.2 releaseDan McGee2008-02-11
| | | | | | | | | | | | For 7 message changes, this commit is far too large... Signed-off-by: Dan McGee <dan@archlinux.org>
* | Ensure DESC infolevel is loaded before checking pkg->filenameDan McGee2008-02-13
| | | | | | | | | | | | | | | | | | | | | | This is the first step of fixing FS#9547. This should not break any existing code that may rely on this function behaving the way it did, and should be good for inclusion in a maint release. In addition, update pactest so it fills the FILENAME field in the DB entries it creates so we can move forward with a real fix to this issue. Signed-off-by: Dan McGee <dan@archlinux.org>
* | Update NEWS in prep for 3.1.2 releaseDan McGee2008-02-11
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
* | setlibpaths(): remove a stray set_option lineDan McGee2008-02-11
| | | | | | | | | | | | | | | | | | For some reason, we set our dbpath to the logfile path, which was completely broken, and we didn't even check the return value coming back (which of course was -1 meaning the set failed). Add some comments so people can understand what is going on here now too. Signed-off-by: Dan McGee <dan@archlinux.org>
* | Move some translations to their generic language codeDan McGee2008-02-11
| | | | | | | | | | | | | | | | | | | | | | | | For our Czech, Polish, and Russian translations, they do not need to be at the more specific 'lang_COUNTRY' code, but can live at just plain 'lang'. This follows the pattern of most other translated programs out there as Roman pointed out on IRC. ru_RU: 2 (pacman and libalpm) ru: 128 for him, 131 for me (everything else) Signed-off-by: Dan McGee <dan@archlinux.org>
* | ensure chk_fileconflicts reads entire file listDan McGee2008-02-11
| | | | | | | | | | | | | | | | | | | | | | | | If the end of the pB list was reached before the end of pA, we failed to read any remaining files from the pA list. Add an additional loop to ensure all entries of pA are added to the return list regardless of whether we have reached the end of pB. This new loop also eliminates the now-unnecessary check for a null pB, as we need to ensure we are excluding directories in the resulting output anyway. Signed-off-by: Dan McGee <dan@archlinux.org>
* | Fixes file relocation pactestsNagy Gabor2008-02-11
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes upgrade040.py and upgrade041.py (041 now fails!): * the old pactests didn't check the existence of the relocated file * upgrade041.py was broken due to a typo (missing comma) New upgrade046.py pactest was added (derived from the fixed upgrade041.py). This fails because the file relocation check is _hacked_ to conflict.c, and _alpm_db_find_fileconflicts is not called in case of --force. Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
* | makepkg : set sane umask before source extraction.Chantry Xavier2008-02-11
|/ | | | | | | | | | | This fixes FS#9242 and FS#9362. Set umask before the sources are extracted, and after the /etc/profile.d/* files are sourced in handledeps. This sourcing of profile.d files is why umask was moved to the build function in the first place, as can be seen in commit ac965ed401. Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
* makepkg: do a quick check for the VCS binariesDan McGee2008-02-07
| | | | | | | Fixes FS#9230. Ensure we have the VCS binaries available when doing the development version number checking. Signed-off-by: Dan McGee <dan@archlinux.org>
* pactest: make more resiliant to missing filesDan McGee2008-02-07
| | | | | | | | | | | | Add a bunch of guards around function calls like open() and stat() to ensure we are not going to get ourselves a python error. This made implementing and testing the new upgrade045 pactest much easier, as its whole purpose was to create a dead symlink and debug a segfault of pacman (which caused no DB entries to be written) to support the previously checked in fix for FS#9235 (commit 0c2206f542ce6df2606586d43f190cd5a423fb13). Both of these cases are now non-fatal in pactest. Signed-off-by: Dan McGee <dan@archlinux.org>
* libalpm/add.c : safety check for fixing FS#9235.Chantry Xavier2008-02-07
| | | | | | | | | | | | | | | Fixes FS#9235. We already had the following case in extract_single_file : /* cases 1,2,3: couldn't stat an existing file, skip all backup checks */ But we actually only did a lstat here. And if lstat worked, we did a stat without checking. When lstat works and stat fails, it means we have a broken symlink, like in FS#9235. We can actually treat this case like a non-existing file. The broken symlink will then be simply overwritten. Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
* Don't follow symlinks with -Qo.Chantry Xavier2008-02-05
| | | | | | | | | | Fixes FS#9473 and the issue reported there : http://www.archlinux.org/pipermail/pacman-dev/2008-February/011061.html Only the dirname should be resolved, not the basename. Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>