summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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>
| * Update Chinese translation甘露(Gan Lu)2009-01-03
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
| * Update French translationXavier Chantry2009-01-03
| | | | | | | | Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
| * Update Spanish translationJuan Pablo González Tognarelli2009-01-03
| | | | | | | | Signed-off-by: Dan McGee <dan@archlinux.org>
* | Merge branch 'maint'Dan McGee2009-01-03
|\|
| * Separate local db directory creation and db writeAllan McRae2009-01-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changelogs and install files were getting extracted into the local db folder before it was manually created. This created issues for uses with 0077 umasks and was highlighted with the new sudo handling of umasks (FS#12263). This moves the local db creation to its own function which is called before the start of package archive extraction. Also, added a check that the folder is actually created. Signed-off-by: Allan McRae <allan@archlinux.org> [Dan: rename to _alpm_db_prepare()] Signed-off-by: Dan McGee <dan@archlinux.org>
| * Log pacsave warnings to pacman.logSterling Winter2009-01-02
| | | | | | | | | | | | | | | | | | | | | | Pacman currently logs .pacnew warnings to pacman.log but a similar history of .pacsave warnings isn't kept. The user should be able to search pacman.log to discover when and where all .pac* files were created by pacman. Addresses FS#12531. Signed-off-by: Dan McGee <dan@archlinux.org>
* | makepkg: Add support for specifying LDFLAGSAllan McRae2009-01-03
| | | | | | | | | | | | | | | | Provide support for specifying LDFLAGS within makepkg.conf but leaves this undefined by default. Fixes FS#12542. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
* | makepkg: move BUILDSCRIPT from makepkg.confAllan McRae2009-01-03
| | | | | | | | | | | | | | | | | | | | | | Commit 4b183bf9 moved makepkg.conf sourcing to after the parsing of options, breaking the -p option and --help output. The solution is to move BUILDSCRIPT out of makepkg.conf. This patch moves the definition BUILDSCRIPT back to makepkg itself and adds configure option to allow easy changing of this value during build time. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
* | makepkg: Introduce purge optionAllan McRae2009-01-03
| | | | | | | | | | | | | | | | | | | | The purge option, combined with the PURGE_TARGETS variable, allows makepkg to automatically remove commonly confliting or removed files (e.g. /usr/share/info/dir, *.pod). Original work: Tim Yang Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
* | makepkg: Add used options to PKGINFO fileAllan McRae2009-01-03
| | | | | | | | | | | | | | | | | | | | Adds defined options to the PKGINFO file in the form of "makepkgopt =". It may be useful to be able to add these to the pacman DB at some point as that would allow (e.g.) checking which packages have had their docs striped (FS#7092). Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
* | makepkg: add fallback for when MAN_DIRS is unsetAllan McRae2009-01-03
| | | | | | | | | | | | | | | | This prevents makepkg compressing every file when MAN_DIRS is not supplied in makepkg.conf Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
* | makepkg: provide MAN_DIRS configuration variableAllan McRae2009-01-03
| | | | | | | | | | | | | | | | | | | | | | | | Provides a MAN_DIRS variable in makepkg.conf which can be used to specify folders to look for manual (man and info) pages to be compressed. Useful for packages that install to /opt. Also clarifies that "zipman" means "zip manuals" and covers both man and info pages. Original work by: Tiago Pierezan Camargo <tcamargo at gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>