summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Make local_db_read() private to the local backendDan McGee2011-06-30
| | | | | | | | | | | | | | | | | | | There is little need to expose the guts of this function even within the library. Make it static in be_local.c, and clean up a few other things since we know exactly where it is being called from: * Remove unnecessary origin checks in _cache_get_*() methods- if you are calling a cache method your package type will be correct. * Remove sanity checks within local_db_read() itself- packages will always have a name and version if they get this far, and the package object will never be NULL either. The one case calling this from outside the backend was in add.c, where we forced a full load of a package before we duplicated it. Move this concern elsewhere and have pkg_dup() always force a full package load via a new force_load() function on the operations callback struct. Signed-off-by: Dan McGee <dan@archlinux.org>
* Fix a few warnings pointed out via clang scan-buildDan McGee2011-06-30
| | | | | | | | | Some of these are legit (the backup hash NULL checks), while others are either extemely unlikely or just impossible for the static code analysis to prove, but are worth adding anyway because they have little overhead. Signed-off-by: Dan McGee <dan@archlinux.org>
* fix vim syntax highlighting of .sh filesFlorian Pritz2011-06-30
| | | | | | | | | | vim recognises what type of shell script it's dealing with by looking at the shebang. If detection fails it falls back to sh which doesn't support some bash features. Adding a normal, possibly broken, shebang which gets fixed by the Makefile allows vim to detect bash syntax. Signed-off-by: Florian Pritz <bluewind@xinu.at> Signed-off-by: Dan McGee <dan@archlinux.org>
* Merge remote-tracking branch 'dave/makepkg'Dan McGee2011-06-30
|\
| * makepkg: simplify SIGNPKG checkDave Reisner2011-06-28
| | | | | | | | Signed-off-by: Dave Reisner <d@falconindy.com>
| * makepkg: fix vim syntax highlightingDave Reisner2011-06-28
| | | | | | | | Signed-off-by: Dave Reisner <d@falconindy.com>
| * makepkg: remove unneeded echoDave Reisner2011-06-28
| | | | | | | | Signed-off-by: Dave Reisner <d@falconindy.com>
* | Merge remote-tracking branch 'allan/breakshit'Dan McGee2011-06-30
|\ \
| * | Use ignoregroup rather than ignoregrp in the handleAllan McRae2011-06-29
| | | | | | | | | | | | | | | | | | This matches the naming in pacman.conf. Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename internal functions with grp in their nameAllan McRae2011-06-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following function renames take place for the same reasoning as the previous commit: _alpm_grp_new -> _alpm_group_new _alpm_grp_free -> _alpm_group_free _alpm_db_free_grpcache -> _alpm_db_free_groupcache _alpm_db_get_grpfromcache -> _alpm_db_get_groupfromcache Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename public functions with grp in their nameAllan McRae2011-06-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using grp instead of group is a small saving at the cost of clarity. Rename the following functions: alpm_option_get_ignoregrps -> alpm_option_get_ignoregroups alpm_option_add_ignoregrp -> alpm_option_add_ignoregroup alpm_option_set_ignoregrps -> alpm_option_set_ignoregroups alpm_option_remove_ignoregrp -> alpm_option_remove_ignoregroup alpm_db_readgrp -> alpm_db_readgroup alpm_db_get_grpcache -> alpm_db_get_groupcache alpm_find_grp_pkgs -> alpm_find_group_pkgs Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Update README with changes to struct namesAllan McRae2011-06-28
| | | | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename _pmdbstatus_t to _alpm_dbstatus_tAllan McRae2011-06-28
| | | | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename pmdbinfrq_t to alpm_dbinfrq_tAllan McRae2011-06-28
| | | | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename pmtransstate_t to alpm_transstate_tAllan McRae2011-06-28
| | | | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename pmpkghash_t to alpm_pkghash_tAllan McRae2011-06-28
| | | | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename pmgraph_t to alpm_graph_tAllan McRae2011-06-28
| | | | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename pmpkgfrom_t to alpm_pkgfrom_tAllan McRae2011-06-28
| | | | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename pmerrno_t to alpm_errno_tAllan McRae2011-06-28
| | | | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename pmtransprog_t to alpm_transprog_tAllan McRae2011-06-28
| | | | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename pmtransconv_t to alpm_transconv_tAllan McRae2011-06-28
| | | | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename pmtransevt_t to alpm_transevt_tAllan McRae2011-06-28
| | | | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename pmtransflag_t to alpm_transflag_tAllan McRae2011-06-28
| | | | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename pmloglevel_t to alpm_loglevel_tAllan McRae2011-06-28
| | | | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename pmbackup_t to alpm_backup_tAllan McRae2011-06-28
| | | | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename pmdelta_t to alpm_delta_tAllan McRae2011-06-28
| | | | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename pmgrp_t to alpm_group_tAllan McRae2011-06-28
| | | | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename pmfileconflict_t to alpm_fileconflict_tAllan McRae2011-06-28
| | | | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename pmconflict_t to alpm_conflict_tAllan McRae2011-06-28
| | | | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename pmdepmissing_t to alpm_depmissing_tAllan McRae2011-06-28
| | | | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename pmdepend_t to alpm_depend_tAllan McRae2011-06-28
| | | | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename pmtrans_t to alpm_trans_tAllan McRae2011-06-28
| | | | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename pmpkg_t to alpm_pkg_tAllan McRae2011-06-28
| | | | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename pmdb_t to alpm_db_tAllan McRae2011-06-28
| | | | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename pmhandle_t to alpm_handle_tAllan McRae2011-06-28
| | | | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename pmfileconflicttype_t to alpm_fileconflicttype_tAllan McRae2011-06-28
| | | | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename pmdepmod_t to alpm_depmod_tAllan McRae2011-06-28
| | | | | | | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
| * | Rename pmpkgreason_t to alpm_pkgreason_tAllan McRae2011-06-28
| |/ | | | | | | Signed-off-by: Allan McRae <allan@archlinux.org>
* | lib/util: modify entry_prefix, not prefixDave Reisner2011-06-30
| | | | | | | | | | | | | | | | | | Modifying prefix caused tmp directories to be left behind after running scriptlets, and the path '/' to be passed to _alpm_rmrf. Broken in f01c6f. Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
* | lib/alpm: unlock the handle before freeing itDave Reisner2011-06-30
| | | | | | | | | | | | | | | | | | | | This avoids, probably among other things, leaving the lock file in place after a SIGINT'd sync DB update. Fixes regression introduced in 4f8ae2b. Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
* | repo-add.sh.in: avoid being clever with repo repackingDave Reisner2011-06-30
| | | | | | | | | | | | | | | | | | Revert to the old behavior that 6f5a90 attempted to simplify and go with the original proposed solution of using "ugly" bash to detect empty directories. Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
* | repo-add: fix db creation one last timeDan McGee2011-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We fubar-ed this pretty good. 1. The whole old/new move shuffle was totally busted if you used a relative path to your database, as we would just build the database in place. 2. Our prior temp directory layout had the database files extracted directly into it. When we tried to create a xxx.db.tar.gz file in this same directory, due to the fact that we were no longer using a shell wildcard, we tried to include the db in ourself, which is a big failure. Fix all this by extracting to tree/ so we can have a clean top-level temp directory. 3. Fix the inclusion of the './' directory entry; ensure the regex prunes both leading paths of '.' as well as './'. Where is that test suite again? Signed-off-by: Dan McGee <dan@archlinux.org>
* | makepkg: only source user override if using default config fileDan McGee2011-06-30
| | | | | | | | | | | | | | Otherwise there is no way to easily test or run with a standalone config file without outside interference. Signed-off-by: Dan McGee <dan@archlinux.org>
* | makepkg: fix typo (missing quotes)Rémy Oudompheng2011-06-30
| | | | | | | | | | | | Signed-off-by: Rémy Oudompheng <remy@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
* | makepkg: fix removing symbolic linkAllan McRae2011-06-30
|/ | | | | | | | | The path was not being stripped from $file before prefixing with $srcdir resulting in the attempted removal of a very weird filename. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
* Revert "Merge branch 'master' of git://projects.archlinux.org/pacman"Dan McGee2011-06-27
| | | | | | | This reverts the merge of 2d32a9a3a348d25d6d0f3d12752399bf7fdf6570, which reverts the commit 8581694ceb63f4ed2854206b38574599c3d9df28. Thanks Dave for the dirty branch and non-clean rebase! :) Dave broke it.
* repo-add: remove extra exit callDan McGee2011-06-27
| | | | Signed-off-by: Dan McGee <dan@archlinux.org>
* pacman-optimize: use output libraryDan McGee2011-06-27
| | | | | | | | We already use msg() and error() in here, might as well just use the standard functions. In addition, fix one translated message that would have printed ERROR twice if anyone ever saw it. Signed-off-by: Dan McGee <dan@archlinux.org>
* Merge remote-tracking branch 'dave/repo-add'Dan McGee2011-06-27
|\
| * repo-add: add new command, repo-elephantDave Reisner2011-06-27
| | | | | | | | | | | | | | | | | | | | | | | | _ _ / \__/ \_____ / / \ \ `\ ) \''/ ( |\ `\__)/__/'_\ / ` //_|_|~|_|_| ^""'"' ""'"' Signed-off-by: Dave Reisner <d@falconindy.com>