[pacman-dev] CVS update of pacman-lib/src/pacman (add.c sync.c)

[Aaron Griffin]

    Date: Friday, February 23, 2007 @ 02:50:35
  Author: aaron
    Path: /home/cvs-pacman/pacman-lib/src/pacman

Modified: add.c (1.31 -> 1.32) sync.c (1.113 -> 1.114)

* conflicts are returned with the full path, so prepending root is redundant


--------+
 add.c  |    6 ++----
 sync.c |    8 +++-----
 2 files changed, 5 insertions(+), 9 deletions(-)


Index: pacman-lib/src/pacman/add.c
diff -u pacman-lib/src/pacman/add.c:1.31 pacman-lib/src/pacman/add.c:1.32
--- pacman-lib/src/pacman/add.c:1.31	Tue Feb 13 23:52:17 2007
+++ pacman-lib/src/pacman/add.c	Fri Feb 23 02:50:35 2007
@@ -124,16 +124,14 @@
 					pmconflict_t *conflict = alpm_list_getdata(i);
 					switch(alpm_conflict_get_type(conflict)) {
 						case PM_CONFLICT_TYPE_TARGET:
-							MSG(NL, _("%s%s exists in both '%s' and '%s'\n"),
-											alpm_option_get_root(),
+							MSG(NL, _("%s exists in both '%s' and '%s'\n"),
 							        alpm_conflict_get_file(conflict),
 							        alpm_conflict_get_target(conflict),
 							        alpm_conflict_get_ctarget(conflict));
 						break;
 						case PM_CONFLICT_TYPE_FILE:
-							MSG(NL, _("%s: %s%s exists in filesystem\n"),
+							MSG(NL, _("%s: %s exists in filesystem\n"),
 							        alpm_conflict_get_target(conflict),
-											alpm_option_get_root(),
 							        alpm_conflict_get_file(conflict));
 						break;
 					}
Index: pacman-lib/src/pacman/sync.c
diff -u pacman-lib/src/pacman/sync.c:1.113 pacman-lib/src/pacman/sync.c:1.114
--- pacman-lib/src/pacman/sync.c:1.113	Wed Feb 21 03:16:26 2007
+++ pacman-lib/src/pacman/sync.c	Fri Feb 23 02:50:35 2007
@@ -511,7 +511,7 @@
 		 * when sysupgrade'ing with an older version of pacman.
 		 */
 		data = alpm_trans_get_packages();
-		for(i = alpm_list_first(data); i; i = alpm_list_next(i)) {
+		for(i = data; i; i = alpm_list_next(i)) {
 			pmsyncpkg_t *sync = alpm_list_getdata(i);
 			pmpkg_t *spkg = alpm_sync_get_package(sync);
 			if(strcmp("pacman", alpm_pkg_get_name(spkg)) == 0 && alpm_list_count(data) > 1) {
@@ -706,16 +706,14 @@
 				pmconflict_t *conflict = alpm_list_getdata(i);
 				switch(alpm_conflict_get_type(conflict)) {
 				case PM_CONFLICT_TYPE_TARGET:
-					MSG(NL, _("%s%s exists in both '%s' and '%s'\n"),
-							alpm_option_get_root(),
+					MSG(NL, _("%s exists in both '%s' and '%s'\n"),
 							alpm_conflict_get_file(conflict),
 							alpm_conflict_get_target(conflict),
 							alpm_conflict_get_ctarget(conflict));
 					break;
 				case PM_CONFLICT_TYPE_FILE:
-					MSG(NL, _("%s: %s%s exists in filesystem\n"),
+					MSG(NL, _("%s: %s exists in filesystem\n"),
 							alpm_conflict_get_target(conflict),
-							alpm_option_get_root(),
 							alpm_conflict_get_file(conflict));
 					break;
 				}