* Cosmetic changes and typo fixes

* IgnorePkg and --ignore work again
* Partial changes to support removal of conflicts for -U and -A (INCOMPLETE)

2 files changed, 5 insertions, 4 deletions

diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 05738c33..42cd2f85 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -146,6 +146,7 @@ static void usage(int op, char *myname)
 			printf(_("  -e, --dependsonly   install dependencies only\n"));
 			printf(_("  -f, --force         force install, overwrite conflicting files\n"));
 			printf(_("  -g, --groups        view all members of a package group\n"));
+			printf(_("  -i, --info          view package information\n"));
 			printf(_("  -p, --print-uris    print out URIs for given packages and their dependencies\n"));
 			printf(_("  -s, --search        search remote repositories for matching strings\n"));
 			printf(_("  -u, --sysupgrade    upgrade all packages that are out of date\n"));
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index 29a8b6c6..1e9bbd89 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -361,7 +361,7 @@ int pacman_sync(list_t *targets)
 	int confirm = 0;
 	int retval = 0;
 	list_t *i = NULL;
-	pmlist_t *packages, *data, *lp;
+	pmlist_t *packages = NULL, *data = NULL, *lp = NULL;
 
 	if(pmc_syncs == NULL || !list_count(pmc_syncs)) {
 		ERR(NL, _("no usable package repositories configured.\n"));
@@ -449,7 +449,7 @@ int pacman_sync(list_t *targets)
 						return(1);
 					}
 					if(alpm_trans_addtarget("pacman") == -1) {
-						ERR(NL, _("could not add target '%s': %s\n"), (char *)i->data, alpm_strerror(pm_errno));
+						ERR(NL, _("'%s': %s\n"), (char *)i->data, alpm_strerror(pm_errno));
 						retval = 1;
 						goto cleanup;
 					}
@@ -470,7 +470,7 @@ int pacman_sync(list_t *targets)
 					continue;
 				}
 				if(pm_errno != PM_ERR_PKG_NOT_FOUND) {
-					ERR(NL, _("could not add target '%s': %s\n"), (char *)i->data, alpm_strerror(pm_errno));
+					ERR(NL, _("'%s': %s\n"), (char *)i->data, alpm_strerror(pm_errno));
 					retval = 1;
 					goto cleanup;
 				}
@@ -518,7 +518,7 @@ int pacman_sync(list_t *targets)
 						/* targ is provided by pname */
 						targets = list_add(targets, strdup(pname));
 					} else {
-						ERR(NL, _("could not add target '%s': not found in sync db\n"), targ);
+						ERR(NL, _("'%s': not found in sync db\n"), targ);
 						retval = 1;
 						goto cleanup;
 					}