summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2008-02-23Fix wide character output for add/remove/upgrade/conflict progressDan McGee1-16/+33
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>
2008-02-23Fix wide character output for download progressDan McGee1-6/+33
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>
2008-02-22Add new Simplified Chinese translation甘露(Lu.Gan)5-0/+2721
Thanks a lot! Now we get to fix the breakage this causes in output messages. Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-21Updates before 3.1.2 releasev3.1.2Dan McGee2-3/+7
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-21Fix two missing BUILDSCRIPT variables in makepkg.Mark Constable1-2/+2
Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
2008-02-20Lock the database on -Sc operation.Chantry Xavier1-1/+12
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>
2008-02-20Add new sync_trans_init and sync_trans_release.Chantry Xavier1-22/+28
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>
2008-02-20More small updates to Spanish translationFernando Lagos1-2/+2
Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
2008-02-19When cleaning DBs, only look at directoriesDan McGee1-3/+11
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>
2008-02-19Final updates to Polish translationMateusz Herych2-181/+172
Good job on the group effort guys, thanks for getting this one complete. Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-18Update pacman Russian translation.Vitaly Dolgov1-183/+178
Cleaned up by Oleg Finkelshteyn. Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-18Update libalpm russian translation.Sergey Tereschenko1-178/+168
Cleaned up by Oleg Finkelshteyn. Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
2008-02-18Do not warn about up to date package when downloading onlyAllan McRae1-2/+4
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>
2008-02-18Updates to Russian translationВладимир Байраковский1-402/+431
Note that it still is not complete. Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-18scripts: allow usage when gettext is not installedDan McGee6-0/+46
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>
2008-02-18Fix conflict progress bar with UTF-8 charsChantry Xavier1-24/+8
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>
2008-02-18Remove reference to gnome in DOC_DIRSDan McGee1-1/+1
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>
2008-02-17Updated Spanish translation for 3.1.2 releaseJuan Pablo Gonzalez1-7/+10
Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
2008-02-17Add gettext call to 2 'failed' messagesDan McGee2-2/+2
Noticed-by: Vojtěch Gondžala <vogo@seznam.cz> Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-15More small updates to German translationMatthias Gorissen2-8/+10
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-15Update Polish translationJaroslaw Swierczynski1-543/+365
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-15Merge branch 'translations' into maintDan McGee13-4036/+4111
2008-02-15Update German translationBenjamin Andresen1-28/+11
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-15Updated Brazilian Portuguese translation for 3.1.2 releaseJoão Felipe Santos1-63/+71
Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
2008-02-14Ensure DESC infolevel is loaded before checking pkg->filenameDan McGee3-7/+5
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>
2008-02-12Updated Hungarian translation for 3.1.2 releaseNagy Gabor1-234/+256
Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
2008-02-12Updated Czech translation for 3.1.2 releaseVojtěch Gondžala2-168/+127
Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
2008-02-12Updated English translation for 3.1.2 releaseJeff Bailes1-9/+11
Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
2008-02-12Update french translation.Chantry Xavier2-53/+10
Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
2008-02-12Updated Italian translation for 3.1.2 releaseGiovanni Scafora1-12/+14
Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
2008-02-12Update translation files in prep for 3.1.2 releaseDan McGee11-3643/+3785
For 7 message changes, this commit is far too large... Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-12Update NEWS in prep for 3.1.2 releaseDan McGee1-0/+13
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-12setlibpaths(): remove a stray set_option lineDan McGee1-6/+10
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>
2008-02-12Move some translations to their generic language codeDan McGee9-9/+9
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>
2008-02-12ensure chk_fileconflicts reads entire file listDan McGee2-4/+26
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>
2008-02-12Fixes file relocation pactestsNagy Gabor3-1/+34
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>
2008-02-12makepkg : set sane umask before source extraction.Chantry Xavier1-3/+3
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>
2008-02-08makepkg: do a quick check for the VCS binariesDan McGee1-0/+7
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>
2008-02-08pactest: make more resiliant to missing filesDan McGee3-2/+33
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>
2008-02-07libalpm/add.c : safety check for fixing FS#9235.Chantry Xavier1-6/+4
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>
2008-02-06Don't follow symlinks with -Qo.Chantry Xavier1-4/+11
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>
2008-02-06pacman/util.c: add mdirname functionDan McGee2-0/+29
This function mirrors mbasename and will be used by the 'owns' machinery. Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-06doc/makepkg: document --log, address locale issuesDan McGee1-1/+13
Looks like no one ever documented -L/--log, so do that now. In addition, address some of the issues brought up in FS#9156 and add a note about build output and logs being in the current locale. Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-06Add new ChangeLog.proto file.Chantry Xavier2-1/+17
Fixes FS#7231. Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
2008-02-03add 'force' to PKGINFO, have repo-add respect it.Chantry Xavier2-2/+5
Ref: http://www.archlinux.org/pipermail/pacman-dev/2008-January/011023.html Also see FS#9347 and FS#9349. Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-03Clarify the "failed to add target" errors.Chantry Xavier3-5/+6
Make the error message printed when addtarget fails consistent between add.c, remove.c and sync.c. The main problem was that the "failed to add target" in case of a removal operation could sound confusing. There was also a little output problem with -U ("failed" was missing). Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-03repo-remove: print an error in case of an empty dbChantry Xavier1-1/+3
When removing the last packages from a database, repo-remove silently failed. Now an error is printed. Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-02Add deprecation warnings to gensync and updatesyncDan McGee2-0/+14
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-02Remove /bin/true from install.protoRoman Kyrylych1-28/+29
Signed-off-by: Roman Kyrylych <roman@archlinux.org> [Dan: update indentation inside functions] Signed-off-by: Dan McGee <dan@archlinux.org>
2008-02-02updatesync: incorrect package deletion logicAlex Merry1-5/+9
Fixes FS#9279. Signed-off-by: Dan McGee <dan@archlinux.org>