summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAurelien Foret <aurelien@archlinux.org>2005-05-02 10:05:47 +0200
committerAurelien Foret <aurelien@archlinux.org>2005-05-02 10:05:47 +0200
commita53bf5018986ed1bef4958ad56e5dd87266485fd (patch)
tree7f00e22fba623ef750e9ab8f413a9586b2195bb5
parent22967aeba5cec13d1b580daaeaebd3d84ffed413 (diff)
downloadpacman-a53bf5018986ed1bef4958ad56e5dd87266485fd.tar.gz
pacman-a53bf5018986ed1bef4958ad56e5dd87266485fd.tar.xz
get ride of ORE tags
-rw-r--r--src/pacman/pacman.c9
-rw-r--r--src/pacman/sync.c4
2 files changed, 5 insertions, 8 deletions
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 24a798ef..45b5cfd3 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -259,11 +259,10 @@ int pacman_deptest(list_t *targets)
return(1);
}
- /* ORE
- * For ADD transaction, implement a hack to alpm_trans_addtarget() to add
- * a dummy target based on the pattern: "__dummy__|version|dep1|dep2|..."
- * where "dummy" is the package name, "version" its version, and every dep?
- * the content of the "depends" field.
+ /* We use a hidden facility from alpm_trans_addtarget() to add a dummy
+ * target to the transaction (see the library code for details).
+ * It allows us to use alpm_trans_prepare() to check dependencies of the
+ * given target.
*/
str = (char *)malloc(strlen("name=dummy|version=1.0-1")+1);
strcpy(str, "name=dummy|version=1.0-1");
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index 85ab03b9..35e8513b 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -446,9 +446,7 @@ int pacman_sync(list_t *targets)
MSG(NL, ":: It is recommended that you allow pacman to upgrade itself\n");
MSG(NL, ":: first, then you can re-run the operation with the newer version.\n");
MSG(NL, "::\n");
- if(yesno(":: Upgrade pacman first? [Y/n] ")) {
- /* ORE
- we should substitute existing targets with "pacman" */
+ if(!yesno(":: Upgrade anyway? [Y/n] ")) {
retval = 0;
alpm_trans_release();
goto cleanup;