summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Reorganize code for one-at-a-time resolvingBryan Ischo2009-02-18
| | | | | | | | | | | | This change reorganizes the internal code so that packages are resolved one at a time instead of all at once from a list. This will allow a future checkin to prompt the user to see if they'd rather remove unresolvable packages from the transaction and continue, or fail the transaction. This change does not affect the actual behavior of libalpm and all tests pass without changes. Signed-off-by: Bryan Ischo <bryan@ischo.com> Signed-off-by: Dan McGee <dan@archlinux.org>
* repo-add : remove useless test_repo_db_file functionXavier Chantry2009-02-18
| | | | | | | | This function was used only once, was basically just one line, and was also called with an unused argument. Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
* contrib/pacdiff : rework and cleanupXavier Chantry2009-02-18
| | | | | | | | | | | | | | | | I initially only wanted to add a -l/--locate option to use locate instead of find, which should have been easy. Then I thought I would try to support filename with whitespace while I was at it, and this was a bit more complex. The safest ways seem to be the following ones : http://mywiki.wooledge.org/BashFAQ/020 Then I received a lot of suggestions on #bash about how to improve the script, which I tried to address. Signed-off-by: Xavier Chantry <shiningxc@gmail.com> [Dan: fix grouping of find arguments] Signed-off-by: Dan McGee <dan@archlinux.org>
* configure.ac: use full path of stat for Mac OS XKevin Barry2009-02-16
| | | | | | | | | | Change configure.ac to use the full path of stat when on darwin/mac. This is needed for situations when a user installs the GNU/coreutils and places it in their path before /usr/bin, but the SIZECMD is already configured for Darwin's version of stat. Signed-off-by: Kevin Barry <barryk gmail com> Signed-off-by: Dan McGee <dan@archlinux.org>
* Merge branch 'maint'Dan McGee2009-02-08
|\
| * makepkg: Make stripping debug symbols cross-platformSebastian Nowicki2009-02-08
| | | | | | | | | | | | | | | | The Linux and BSD versions of strip have the --strip-debug option (as well as the -S option), however Mac OS X only has -S. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
* | Delay the creation of local and sync db dir.Xavier Chantry2009-01-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to create the directories when local or sync dbs are registered. For example, if a sync db does not exist, we cannot even do "pacman -Q" as an user. Instead, we can create the local db if needed during the db_prepare operation, and sync dbs on db_update. Also remove some more useless abstractions in db_update and switch to a much more efficient way to remove a sync db : rm -rf. Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
* | Remove some db abstraction crap.Xavier Chantry2009-01-20
| | | | | | | | | | | | | | | | These db_open and db_close looked quite useless. And they caused the db directory to be opened on a simple registering of a database. This is totally unneeded, this opening can be delayed to when we actually need it. Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
* | alpm_unpack : change prefix handling to workaround FS#12148.Xavier Chantry2009-01-20
| | | | | | | | | | | | | | | | | | Instead of appending the prefix to each entry name, we can chdir to the prefix before extracting, and restoring when it is done. This seems to work better with the strange and special case of FS#12148 where an archive contained the "./" entry. Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
* | Merge branch 'maint'Dan McGee2009-01-18
|\|
| * Use archive_entry_set_perm instead of archive_entry_set_modeNagy Gabor2009-01-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes FS#12148 ('unstable' regular file). I also changed the other archive_entry_set_mode usage in add.c to archive_entry_set_perm. Since I cannot find any relevant info in libarchive manual, I quote Tim Kientzle (the author of libarchive) here, and I say thank you for his help. *** Tim Kientzle wrote ************************************* This is the problem in libalpm/util.c: 323 if(S_ISREG(st->st_mode)) { 324 archive_entry_set_mode(entry, 0644); 325 } else if(S_ISDIR(st->st_mode)) { 326 archive_entry_set_mode(entry, 0755); 327 } Your example unstable.db.tar.gz is not empty. It has one entry in it, called "./". That entry is marked as a directory. But, when you call archive_entry_set_mode(), you are changing the file type! archive_read_extract() then creates the file /var/unstable as you requested. (archive_read_extract() will replace an empty directory with a file.) You should either set the mode value correctly: 323 if(S_ISREG(st->st_mode)) { 324 archive_entry_set_mode(entry, IFREG | 0644); 325 } else if(S_ISDIR(st->st_mode)) { 326 archive_entry_set_mode(entry, IFDIR | 0755); 327 } Or use archive_entry_set_perm(), which does not change the file type: 323 if(S_ISREG(st->st_mode)) { 324 archive_entry_set_perm(entry, 0644); 325 } else if(S_ISDIR(st->st_mode)) { 326 archive_entry_set_perm(entry, 0755); 327 } ************************************************************ Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan@archlinux.org>
* | makepkg: test fixes, part 2Dan McGee2009-01-18
| | | | | | | | | | | | | | | | The goal of this fix was empty string comparisons: - if [ "$pkgname" != "" ]; then + if [ -n "$pkgname" ]; then Signed-off-by: Dan McGee <dan@archlinux.org>
* | makepkg: clean up test usageDan McGee2009-01-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a lot of places, we had the following construct: [ "$foobar" = "0" ] which is better represented by using the integer tests: [ $foobar -eq 0 ] Attempt to unify makepkg to use the latter rather than the former in all places. From here on out we should ensure anything that is set to 0, 1, etc. uses the -eq format rather than =. In addition, fix a few other test anomalies including usage of double equals. Signed-off-by: Dan McGee <dan@archlinux.org>
* | makepkg: repackage rework with package functionsAllan McRae2009-01-17
| | | | | | | | | | | | | | | | | | When using the optional package() function or split packages, the entire packaging step is rerun instead of just final package creation step. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
* | Fixed some inconsistencies and errors in the pactest documentation.Bryan Ischo2009-01-16
| | | | | | | | | | Signed-off-by: Bryan Ischo <bryan@ischo.com> Signed-off-by: Dan McGee <dan@archlinux.org>
* | Merge branch 'am/splitpkg'Dan McGee2009-01-16
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * am/splitpkg: makepkg: implement creation of split packages makepkg: Optional argument for run_package and create_package makepkg: hack around tee in run_package function makepkg: add functions for backup and restore of package fields makepkg: add optional package function makepkg: Add PKGBUILD-split.proto
| * | makepkg: implement creation of split packagesAllan McRae2009-01-16
| | | | | | | | | | | | | | | | | | Adds the ability to create multiple packages from one PKGBUILD Signed-off-by: Allan McRae <allan@archlinux.org>
| * | makepkg: Optional argument for run_package and create_packageAllan McRae2009-01-16
| | | | | | | | | | | | | | | | | | | | | | | | Generalize run_package to allow the passing of a package name directing the use of an alternative package function. A similar adjustment to create_package to prepare split packages. Signed-off-by: Allan McRae <allan@archlinux.org>
| * | makepkg: hack around tee in run_package functionAllan McRae2009-01-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Piping the package function through tee to log the outut also clears any variables set in the package function. This is a problem in split packages as package variable overrides are done in the package function. This is fixed by creating a node which the output is piped through and duplicated using the tee function. Signed-off-by: Allan McRae <allan@archlinux.org>
| * | makepkg: add functions for backup and restore of package fieldsAllan McRae2009-01-16
| | | | | | | | | | | | | | | | | | | | | | | | Adds functions for the backup and restoration of package variables that can be over-ridden during package splitting. Variables which can be overridden are given in the splitpkg_overrides variable. Signed-off-by: Allan McRae <allan@archlinux.org>
| * | makepkg: add optional package functionAllan McRae2009-01-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch allows us to split the building and packaging stages of a PKGBUILD and minimize fakeroot usage. This can be done with less code duplication (run_build and run_package look quite similiar) but the run_package function will be where the package splitting logic is implemented in the future. Signed-off-by: Allan McRae <allan@archlinux.org>
| * | makepkg: Add PKGBUILD-split.protoAllan McRae2009-01-16
| | | | | | | | | | | | | | | | | | Prototype PKGBUILD for package splitting in makepkg Signed-off-by: Allan McRae <allan@archlinux.org>
* | | Make the repo-add quiet flag less quietAaron Griffin2009-01-14
|/ / | | | | | | | | | | | | | | | | | | | | Considering one can easily run: repo-add .... >/dev/null to get only warnings and errors, the -q flag is mostly useless. Make the -q flag silence only level 2 messages. Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
* | makepkg: fix my own stupid mistakeDan McGee2009-01-13
| | | | | | | | | | | | | | We don't want to bail if a certain integrity check wasn't even provided. Whoops. Signed-off-by: Dan McGee <dan@archlinux.org>
* | makepkg: use INTEGRITY_CHECK only for generation of checksumsAaron Schaefer2009-01-13
| | | | | | | | | | | | Signed-off-by: Aaron Schaefer <aaron@elasticdog.com> [Dan: fail if checksum array is incorrectly sized] Signed-off-by: Dan McGee <dan@archlinux.org>
* | doc: Consistency and formatting cleanups (for master)Dan McGee2009-01-13
| | | | | | | | | | | | Bring master in line with some things we just did on maint. Signed-off-by: Dan McGee <dan@archlinux.org>
* | Merge branch 'maint'Dan McGee2009-01-13
|\| | | | | | | | | Conflicts: doc/makepkg.conf.5.txt
| * doc: Consistency and formatting cleanupsDan McGee2009-01-13
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
| * doc: fix some more asciidoc falloutDan McGee2009-01-13
| | | | | | | | | | | | | | They keep changing things on us. This gets rid of the '.ft C' text sprinkled around our listing blocks. Signed-off-by: Dan McGee <dan@archlinux.org>
| * Fix linkman macro to work with asciidoc > 8.3.0Dan McGee2009-01-11
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
* | doc: remove BUILDSCRIPT from makepkg.conf docsDan McGee2009-01-12
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
* | db->pkgcache_loaded and db->grpcache_loadedNagy Gabor2009-01-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clearly the old code was more elegant (NULL cache indicated "not loaded"), but it had some drawbacks, so from now on we indicate the state of caches explicitly. Old drawbacks: When we had an empty database (unstable), libalpm called db_populate after every pkgcache access, because NULL pkgcache indicated "not loaded" state. This is not a common case, but the same situation can happen with grpcache, which is more problematic: If the user had a custom repo with no groups, grpcache was always NULL. (grpcache is also loaded per database.) Thus every get_grpcache call induced a load_grpcache operation, so the benefits of grpcache was completely lost. Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan@archlinux.org>
* | Rename alpm_get_md5sum to alpm_compute_md5sum and alpm_dep_get_string to ↵Nagy Gabor2009-01-12
| | | | | | | | | | | | | | | | | | | | | | alpm_dep_compute_string This patch introduces the following function name convention: _compute_ in function name: the return value must be freed. _get_ in function name: the return value must not be freed. Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan@archlinux.org>
* | HoldPkg reworkNagy Gabor2009-01-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The HoldPkg feature is even more important when the packages to be held are pulled automatically by pacman, in a -Rc and -Rs operation. Before, it only applied when the packages were explicitly requested by the user to be removed. This patch extends holdpkg to -Rc and -Rs by doing the HoldPkg check just before trans_commit. Additionally, the whole HoldPkg stuff was moved to the front-end. I changed the default behavior to "don't remove", so I modified remove030.py pactest as well. See also: FS#9173. Original-work-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan@archlinux.org>
* | Remove libdownload support and fix libfetch one.Xavier Chantry2009-01-12
| | | | | | | | | | | | | | | | | | | | | | | | | | Aaron said to consider libdownload a dead project so libdownload support was removed to more easily fix libfetch one (otherwise many ifdef needed). There was no direct replacement for ferror to detect an error while downloading. So instead, I added a check at the end to see if the file was fully downloaded, which is just a small chunk of code taken from here: http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/net/libfetch/files/fetch.c?only_with_tag=MAIN Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
* | makepkg : fix a lot of breakages caused by AllanXavier Chantry2009-01-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch started as a simple typo fix (pugre instead of purge in two places), as well as a fix of a test which was using PURGE_TARGETS instead of $PURGE_TARGETS. It evolved in a slight handling change of the OPTIONS which have a variable affecting their behavior (strip STRIP_DIRS, docs DOC_DIRS, zipman MAN_DIRS and purge PURGE_TARGETS), as well as a clarification in makepkg.conf. Now when a variable is undefined or empty, the corresponding option will have no effect. It looked weird to have a fallback when a option is defined but empty, it seems more natural to not have any fallbacks. Also re-enable docs by default. It seems arbitrary to delete files from packages by default, and it would be more vanilla and distro agnostic to keep them. docs was also the only negated option. Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
* | Merge branch 'maint'Dan McGee2009-01-06
|\|
| * Update Czech translationVojtěch Gondžala2009-01-05
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
| * Update Portuguese (Brazil) translationHugo Doria2009-01-05
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
| * Update configure.ac for 3.2.2 releaseDan McGee2009-01-04
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
| * Update NEWS for 3.2.2Dan McGee2009-01-04
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
* | Merge branch 'maint'Dan McGee2009-01-04
|\| | | | | | | | | Conflicts: po/it.po
| * Update Polish translationMateusz Herych2009-01-03
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
| * Update Russian translationSergey Tereschenko2009-01-03
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
| * Update Turkish translationSamed Beyribey2009-01-03
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
| * Update Russian translationSergey Tereschenko2009-01-03
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
| * Update Unkranian translationRoman Kyrylych2009-01-03
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
| * Update Italian translationGiovanni Scafora2009-01-03
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
| * Update German translationMatthias Gorissen2009-01-03
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
| * Update Hungarian translationNagy Gabor2009-01-03
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-27 12:43:07 +0000