summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2008-01-24libalpm/sync.c : conflicts resolving cleanup.Chantry Xavier3-158/+115
The original patch from Nagy tried to resolve target vs target conflicts, and so broke the following pactests : sync040, sync041 and sync990 Nagy's proposal to solve this situation was to choose the interactive way, ask the user how to deal with it: either remove pkg1 or remove pkg2 or stop here. So he left this as a TODO. But instead of trying to resolve these conflicts or asking the user, I tried to find a more conservative way, looking at what the current pactests expected: If between the two conflicting packages, one provides the other, pacman will keep that one and remove the other from the target list. That breaks sync893 and sync897. But Dan agreed these two looked weird and should be changed. This commit should close FS#8897, FS#8899 and FS#9024. Reference: http://www.archlinux.org/pipermail/pacman-dev/2007-October/009745.html http://www.archlinux.org/pipermail/pacman-dev/2007-December/010393.html Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-24Fix flip-flopped parameters to CALLOC macroDan McGee1-2/+2
The mixup causes a fail in the build using --enable-debug on x86_64 but not i686, so none of us caught this right away. Fix it. FS#9297. Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-24libalpm/cache.c : don't duplicate packages in pkgcache.Chantry Xavier2-13/+5
Edit _alpm_db_add_pkgincache to not duplicate packages, because this is not needed, is slower, and uses more memory. This made the max memory usage during base reinstall go from 10.4MB to 9.7MB. Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-24testdb : add conflicts checking.Chantry Xavier1-0/+8
Testdb will now scan the local database to check there are no conflicts. I'm not sure how it's possible to get this situation. At least pacman doesn't allow installing a package that conflicts with a local one, without removing the local one. But maybe in a very weird situation, or because of a bug, it could be possible. But anyway, this only requires 5 lines of code. Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-24Add new public alpm_checkdbconflicts function.Chantry Xavier4-5/+11
This function has a limited purpose, but might be interesting to do a sanity check from a frontend (eg testdb). Also removed the private _alpm_checkconflicts function to avoid confusion. This function was used only once in libalpm, in sync.c, and was just a single line anyway. Having to do it manually makes it explicit that we are looking for two kind of conflicts (targ vs targ and db vs targ). Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-24small memleak fix in sync.c.Chantry Xavier1-1/+2
Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
2008-01-22pactest: remove check for root permissions messageDan McGee1-5/+0
Pacman isn't designed to fail when under fakeroot anymore, so kill this check off which fails anyway if the logfile is missing (such as when the --valgrind flag is used). Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-22conflict.c: move debug message out of inner loopDan McGee1-2/+2
We have a debug message in the target vs. target file conflict check, and this is a bit rediculous when it comes to watching output from something like smoke001.py. Instead, put the output outside this inner loop so we only see it at most once per target, which is much more reasonable. Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-22Fix memleak found by add004.pyDan McGee1-12/+8
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-22Merge branch 'maint'Dan McGee7-16/+30
2008-01-22New --asexplicit optionNagy Gabor8-11/+64
This is the symmetric of --asdeps, install packages explicitly. Documentation and completion files were updated accordingly. Added sync301.py and upgrade032.py pactest files to test this. I also made a little modification in ALLDEPS handling too. Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
2008-01-22Move the deptest code from frontend to backend.Chantry Xavier8-58/+51
The deptest code (pacman -T) used by makepkg was mostly in the frontend. There were 2 drawbacks: 1) the public splitdep function returns a pmdepend_t struct, but the _alpm_dep_free function for freeing it is private. So there was a memleak. 2) there is a helper in the backend (satisfycmp in deps.c) which makes this function much easier. So this adds a new public alpm_deptest in libalpm/deps.c, which cleans pacman_deptest in pacman/deptest.c a lot. Besides, alpm_splitdep was made private, because the frontend no longer requires it, and _alpm_dep_free is also private. Finally the deptest001 pactest was extended. Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-22Convert deltas to dynamic allocationDan McGee4-19/+28
Another elimination of a static length structure in libalpm. Should result in a little more memory saved during execution of packages with lots of deltas attached. Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-20two string fixes.Chantry Xavier2-2/+2
* added a newline to a conflict message in add.c * removed the trailing dot in a replace message in callback.c. Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
2008-01-20workaround for a gettext string starting with --.Chantry Xavier1-1/+1
Workaround found in Advanced Bash-Scripting Guide, localization section. "added a \0 (NULL) at the beginning of the sentence." Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
2008-01-20Remove frontend translation of "debug:" messageDan McGee1-2/+2
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-20makepkg: add check to ensure we have non-URL files in build dirDan McGee1-0/+6
Pacman 3.0 printed the following message if a file could not be found: ERROR: xxx was not found in the build directory and is not a proper URL. We lost this logic in 3.1 when moving to the DLAGENT type stuff, so a not-found file got passed all the way to the download logic where it failed with a odd error message. Bring back some logic to ensure only files with URLs get past a certain point, and fail if the file is not available. Fixes FS#9208. Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-19Final changes before 3.1.1 releasev3.1.1Dan McGee2-6/+7
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-19Update TRANSLATORS file.Chantry Xavier1-5/+12
Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
2008-01-19Merge branch 'maint'Dan McGee26-8453/+7687
2008-01-19Merge branch 'translations' into maintDan McGee22-8441/+7655
Thanks a ton to Giovanni Scafora for managing the translations branch for this release!
2008-01-19Little update Czech translation for pacman 3.1.1Vojtěch Gondžala1-7/+7
Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
2008-01-19Portuguese Brazilian translation update for pacman 3.1.1João Felipe Santos2-834/+682
Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
2008-01-18Polish translation update for pacman 3.1.1Mateusz Jędrasik1-142/+145
Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
2008-01-18Corrections of German translationMatthias Gorissen2-539/+393
Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
2008-01-16Spanish translation update for pacman 3.1.1Juan Pablo Gonzalez2-813/+663
Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
2008-01-16Czech translation update for pacman 3.1.1Vojtěch Gondžala2-204/+151
Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
2008-01-16English (British) translation update for pacman 3.1.1Jeff Bailes2-297/+356
Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
2008-01-16Hungarian translation update for pacman 3.1.1Nagy Gabor2-20/+12
Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
2008-01-16Update french translation.Chantry Xavier1-18/+15
Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
2008-01-16Italian translation update for pacman 3.1.1Giovanni Scafora1-28/+27
Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
2008-01-16Updates to NEWS for 3.1.1Dan McGee1-0/+14
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-16Another documentation update for FS#9204Chantry Xavier2-3/+9
Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-16Clarify -Sc documentation.Chantry Xavier1-8/+9
s/old packages/packages that are no longer installed/g. Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-16Fix some left over of a0ac72b42.Chantry Xavier1-1/+0
Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-15Update message files for 3.1.1 releaseDan McGee22-6965/+6630
We are in string freeze for the 3.1.1 release. This commit updates all the message files to the latest code, and all translation updates should be based off of these po-files. Please attempt to keep the line number changes to a minimum- there should be no reason to update these po files with just new line numbers. That way we can more easily see exactly which translations were updated. Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-15Merge branch 'maint'Dan McGee26-168/+148
2008-01-15etc: remove Arch-specific mirrorlist from repoDan McGee5-129/+9
We shouldn't have the stock config be Arch specific for a few reasons: * Although it is our package, others should be able to use it * Keeping the mirrorlist coupled to the pacman package makes it hard to push updates to users without releasing a new copy of the pacman source Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-15Clean up pacman.conf.inTravis Willard1-1/+15
This patch cleans up the Arch-specific pacman.conf (to be provided in the pacman Archlinux package) in an attempt to reduce the number of PEBKAC errors seen enabling default-disabled repos. Signed-off-by: Travis Willard <travis@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-15Change the versioned provision format.Chantry Xavier9-12/+13
Change the 'provname provver' format to 'provname=provver'. In .PKGINFO, the provisions are copied from the PKGBUILD without quotes. So the provision version was actually handled as a different provision... See FS#9171. Dan: Unfortunately we have to change our original specification for versioned provisions with this patch, but it ends up being the simpler and cleaner solution in the long run, and if there is any time to change it the time is now before many packages have been built. Keeping the ' ' based format would have required us to do special parsing in repo-add, as well as being susceptible to users not using quotes in their provides array. Hopefully this will resolve the issues we had with our initial plan. Sorry for the confusion. Acked-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-15Update cachedir documentation (FS#9204).Chantry Xavier1-3/+3
Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-15Rename provision related pactests to provision*.py.Chantry Xavier8-3/+48
Also add 3 new pactests to cover both the -U and -S operations for versioned provisions. Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-15New polish mirror. FS#9213.Chantry Xavier1-0/+2
Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
2008-01-15Revert "Fix case where pacman asks for confirmation when it should not"Chantry Xavier1-2/+1
yesno function already handles noconfirm. No need to do it twice. This reverts commit dffa0654f2eae1c427a74c647d22f0bbd201ccf7.
2008-01-14Fix typos in code commentsDan McGee2-6/+6
Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-14makepkg: Oops! Lost the colon after forcever in opts parsingDan McGee1-1/+1
I screwed this up here: 916e226b7839e38d9245ecbef396eb5ba5b6a224 Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-14doc: update documentation for --recursive and --cascadeChantry Xavier1-5/+7
This addresses some of the issues in FS#9192. Attempt to clarify the -Rc and -Rs options in the man page. Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-14doc: update makepkg optionsDan McGee1-5/+15
Add documentation for --holdver (from Scott) and --forcever (saying this is an internal option that should not be used by most end users), and re-alphabetize the --asroot option. Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-14makepkg: Introduce --holdver option to prevent bumped pkgrelScott Horowitz1-8/+24
This allows us to keep the --forcever option internal to makepkg. Fixes FS#9194. Signed-off-by: Dan McGee <dan@archlinux.org>
2008-01-14FS#9183 : force correct permissions on tmp/.Jaroslaw Swierczynski3-3/+9
[Xav: removed unneeded makepath_internal function, and fixed the permission value : 1777 -> 01777] Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-01 13:55:23 +0100