Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/doc/pacman.8.txt
diff options
context:
space:
mode:
authorNagy Gabor <ngaba@bibl.u-szeged.hu>2009-06-09 17:23:46 +0200
committerDan McGee <dan@archlinux.org>2009-09-08 22:04:14 -0500
commit0da96abc900560f21c643b255c94a60232f4a24b (patch)
tree8bd2ac5027ffd7c181daaf13205d2372fbcd39ae /doc/pacman.8.txt
parentb7db46d610efd5f71d5e4e887fed7a3fd3b3dd86 (diff)
Use sync.c for upgrade transaction prepare and commit
This patch utilizes the power of sync.c to fix FS#3492 and FS#5798. Now an upgrade transaction is just a sync transaction internally (in alpm), so all sync features are available with -U as well: * conflict resolving * sync dependencies from sync repos * remove unresolvable targets See http://www.archlinux.org/pipermail/pacman-dev/2009-June/008725.html for the concept. We use "mixed" target list, where PKG_FROM_FILE origin indicates local package file, PKG_FROM_CACHE indicates sync package. The front-end can add only one type of packages (depending on transaction type) atm, but if alpm resolves dependencies for -U, we may get a real mixed trans->packages list. _alpm_pkg_free_trans() was modified so that it can handle both target types _alpm_add_prepare() was removed, we use _alpm_sync_prepare() instead _alpm_add_commit() was renamed to _alpm_upgrade_targets() sync.c (and deps.c) was modified slightly to handle mixed target lists, the modifications are straightforward. There is one notable change here: We don't create new upgrade trans in sync.c, we replace the pkgcache entries with the loaded package files in the target list (this is a bit hackish) and call _alpm_upgrade_targets(). This implies a TODO (pkg->origin_data.db is not accessible anymore), but it doesn't hurt anything with pacman front-end, so it will be fixed later (otherwise this patch would be huge). I updated the documentation of -U and I added a new pactest, upgrade090.py, to test the syncdeps feature of -U. Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'doc/pacman.8.txt')
-rw-r--r--doc/pacman.8.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt
index 559b45d8..7f92ec71 100644
--- a/doc/pacman.8.txt
+++ b/doc/pacman.8.txt
@@ -82,7 +82,8 @@ to determine which packages need upgrading. This behavior operates as follows:
"bash>=3.2"`.
*-U, \--upgrade*::
- Upgrade or add package(s) to the system. Either a URL or file path can be
+ Upgrade or add package(s) to the system and install the required
+ dependencies from sync repos. Either a URL or file path can be
specified. This is a ``remove-then-add'' process. See <<HCF,Handling Config
Files>> for an explanation on how pacman takes care of config files.