summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'maint'Dan McGee2008-01-27
|\
| * Clarify the "cancel current operation" message.Chantry Xavier2008-01-27
| | | | | | | | | | | | | | | | Fixes FS#9295. Signed-off-by: Chantry Xavier <shiningxc@gmail.com> [Dan: 'new pacman' -> 'new pacman version'] Signed-off-by: Dan McGee <dan@archlinux.org>
| * makepkg : improve determination of svn revision.Chantry Xavier2008-01-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous sed command matched every line starting with r. For example, with mpd-svn package in aur, the svn log output was rather big, and there were several lines starting with r (the actual revision : r7155, but also other lines starting with reverting and run), so this broke makepkg: > makepkg ==> Determining latest svn revision... -> Version found: 7155 everting un sed: -e expression #1, char 27: unterminated `s' command To make the sed command more bullet proof, I added the -q option of svn log, which produces a quieter output, without the log. And I changed the sed command to only match numbers for the revision. Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
| * doc/makepkg.8: add missing '-' to manpage optionDan McGee2008-01-24
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
* | Fix PM_ERR_CONFLICTING_DEPS handling in sync.cNagy Gabor2008-01-27
| | | | | | | | | | | | | | | | | | | | | | | | | | * eliminate asymmetry (innerconflict vs. outerconflict) * fix a memleak (in case of PM_ERR_MEMORY deps wasn't freed) * fix wrong pmconflict_t duplication (*retconflict = *conflict) Note: the new code introduces some code duplication which shall disappear by fixing FS#7524. Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
* | New _alpm_conflict_dup functionNagy Gabor2008-01-27
| | | | | | | | | | | | | | Added function to cleanly duplicate a conflict. Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
* | small sync.c code clean-upNagy Gabor2008-01-27
| | | | | | | | | | | | | | | | | | | | Remove unnecessary synclist_free function, and use our standard way (alpm_list_free_inner + alpm_list_free) instead. This slightly reduces code duplication. Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
* | libalpm/sync.c : conflicts resolving cleanup.Chantry Xavier2008-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Fix flip-flopped parameters to CALLOC macroDan McGee2008-01-23
| | | | | | | | | | | | | | 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>
* | libalpm/cache.c : don't duplicate packages in pkgcache.Chantry Xavier2008-01-23
| | | | | | | | | | | | | | | | | | 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>
* | testdb : add conflicts checking.Chantry Xavier2008-01-23
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Add new public alpm_checkdbconflicts function.Chantry Xavier2008-01-23
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | small memleak fix in sync.c.Chantry Xavier2008-01-23
| | | | | | | | Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
* | pactest: remove check for root permissions messageDan McGee2008-01-21
| | | | | | | | | | | | | | | | 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>
* | conflict.c: move debug message out of inner loopDan McGee2008-01-21
| | | | | | | | | | | | | | | | | | 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>
* | Fix memleak found by add004.pyDan McGee2008-01-21
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
* | Merge branch 'maint'Dan McGee2008-01-21
|\|
| * two string fixes.Chantry Xavier2008-01-20
| | | | | | | | | | | | | | * 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>
| * workaround for a gettext string starting with --.Chantry Xavier2008-01-20
| | | | | | | | | | | | | | 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>
| * Remove frontend translation of "debug:" messageDan McGee2008-01-20
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
| * makepkg: add check to ensure we have non-URL files in build dirDan McGee2008-01-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Final changes before 3.1.1 releaseDan McGee2008-01-19
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
| * Update TRANSLATORS file.Chantry Xavier2008-01-19
| | | | | | | | Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
* | New --asexplicit optionNagy Gabor2008-01-21
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Move the deptest code from frontend to backend.Chantry Xavier2008-01-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Convert deltas to dynamic allocationDan McGee2008-01-21
| | | | | | | | | | | | | | | | 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>
* | Merge branch 'maint'Dan McGee2008-01-18
|\|
| * Merge branch 'translations' into maintDan McGee2008-01-18
| |\ | | | | | | | | | | | | Thanks a ton to Giovanni Scafora for managing the translations branch for this release!
| | * Little update Czech translation for pacman 3.1.1Vojtěch Gondžala2008-01-19
| | | | | | | | | | | | Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
| | * Portuguese Brazilian translation update for pacman 3.1.1João Felipe Santos2008-01-19
| | | | | | | | | | | | Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
| | * Polish translation update for pacman 3.1.1Mateusz Jędrasik2008-01-18
| | | | | | | | | | | | Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
| | * Corrections of German translationMatthias Gorissen2008-01-18
| | | | | | | | | | | | Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
| | * Spanish translation update for pacman 3.1.1Juan Pablo Gonzalez2008-01-16
| | | | | | | | | | | | Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
| | * Czech translation update for pacman 3.1.1Vojtěch Gondžala2008-01-16
| | | | | | | | | | | | Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
| | * English (British) translation update for pacman 3.1.1Jeff Bailes2008-01-16
| | | | | | | | | | | | Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
| | * Hungarian translation update for pacman 3.1.1Nagy Gabor2008-01-16
| | | | | | | | | | | | Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
| | * Update french translation.Chantry Xavier2008-01-16
| | | | | | | | | | | | | | | Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
| | * Italian translation update for pacman 3.1.1Giovanni Scafora2008-01-16
| | | | | | | | | | | | Signed-off-by: Giovanni Scafora <linuxmania@gmail.com>
| | * Update message files for 3.1.1 releaseDan McGee2008-01-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Updates to NEWS for 3.1.1Dan McGee2008-01-15
| | | | | | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
| * | Another documentation update for FS#9204Chantry Xavier2008-01-15
| | | | | | | | | | | | | | | Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
| * | Clarify -Sc documentation.Chantry Xavier2008-01-15
| | | | | | | | | | | | | | | | | | | | | 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>
| * | Fix some left over of a0ac72b42.Chantry Xavier2008-01-15
| |/ | | | | | | | | Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
* | Merge branch 'maint'Dan McGee2008-01-14
|\|
| * etc: remove Arch-specific mirrorlist from repoDan McGee2008-01-14
| | | | | | | | | | | | | | | | | | | | 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>
| * Clean up pacman.conf.inTravis Willard2008-01-14
| | | | | | | | | | | | | | | | | | 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>
| * Change the versioned provision format.Chantry Xavier2008-01-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Update cachedir documentation (FS#9204).Chantry Xavier2008-01-14
| | | | | | | | | | Signed-off-by: Chantry Xavier <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
| * Rename provision related pactests to provision*.py.Chantry Xavier2008-01-14
| | | | | | | | | | | | | | | | 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>
| * New polish mirror. FS#9213.Chantry Xavier2008-01-14
| | | | | | | | Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 18:59:54 +0000