9 files changed, 12 insertions, 12 deletions
diff --git a/pactest/tests/ignore002.py b/pactest/tests/ignore002.py
index b2c5593a..9b09e8f7 100644
--- a/pactest/tests/ignore002.py
+++ b/pactest/tests/ignore002.py
@@ -28,7 +28,7 @@ self.addpkg2db("sync", package4up)
 self.option["IgnorePkg"] = ["package2"]
 self.args = "-Su"
 
-self.addrule("PACMAN_RETCODE=0")
+self.addrule("PACMAN_RETCODE=1")
 self.addrule("PKG_VERSION=package1|1.0-1")
 self.addrule("PKG_VERSION=package2|1.0-1")
 self.addrule("PKG_VERSION=package3|1.0-1")
diff --git a/pactest/tests/ignore003.py b/pactest/tests/ignore003.py
index 02b3c91c..8768a6ef 100644
--- a/pactest/tests/ignore003.py
+++ b/pactest/tests/ignore003.py
@@ -28,7 +28,7 @@ self.addpkg2db("sync", package4up)
 self.option["IgnorePkg"] = ["package2"]
 self.args = "-Su"
 
-self.addrule("PACMAN_RETCODE=0")
+self.addrule("PACMAN_RETCODE=1")
 self.addrule("PKG_VERSION=package1|1.0-1")
 self.addrule("PKG_VERSION=package2|1.0-1")
 self.addrule("PKG_VERSION=package3|1.0-1")
diff --git a/pactest/tests/ignore004.py b/pactest/tests/ignore004.py
index fff12f62..e6af48bd 100644
--- a/pactest/tests/ignore004.py
+++ b/pactest/tests/ignore004.py
@@ -38,7 +38,7 @@ self.addpkg2db("sync", packageA5up)
 self.option["IgnorePkg"] = ["packageA3"]
 self.args = "-S packageA1"
 
-self.addrule("PACMAN_RETCODE=0")
+self.addrule("PACMAN_RETCODE=1")
 self.addrule("PKG_VERSION=packageA1|1.0-1")
 self.addrule("PKG_VERSION=packageA2|1.0-1")
 self.addrule("PKG_VERSION=packageA3|1.0-1")
diff --git a/pactest/tests/ignore005.py b/pactest/tests/ignore005.py
index 1957ea4f..c1a52e66 100644
--- a/pactest/tests/ignore005.py
+++ b/pactest/tests/ignore005.py
@@ -38,9 +38,9 @@ self.addpkg2db("sync", packageA5up)
 self.option["IgnorePkg"] = ["packageA3"]
 self.args = "-S packageA1 packageA2"
 
-self.addrule("PACMAN_RETCODE=0")
+self.addrule("PACMAN_RETCODE=1")
 self.addrule("PKG_VERSION=packageA1|1.0-1")
-self.addrule("PKG_VERSION=packageA2|2.0-1")
+self.addrule("PKG_VERSION=packageA2|1.0-1")
 self.addrule("PKG_VERSION=packageA3|1.0-1")
-self.addrule("PKG_VERSION=packageA4|2.0-1")
-self.addrule("PKG_VERSION=packageA5|2.0-1")
+self.addrule("PKG_VERSION=packageA4|1.0-1")
+self.addrule("PKG_VERSION=packageA5|1.0-1")
diff --git a/pactest/tests/provision020.py b/pactest/tests/provision020.py
index c9c0ac36..7cb0a01b 100644
--- a/pactest/tests/provision020.py
+++ b/pactest/tests/provision020.py
@@ -10,6 +10,6 @@ self.addpkg2db("local", lp)
 
 self.args = "-S %s" % p.name
 
-self.addrule("PACMAN_RETCODE=0")
+self.addrule("PACMAN_RETCODE=1")
 self.addrule("!PKG_EXIST=pkg1")
 self.addrule("PKG_EXIST=pkg2")
diff --git a/pactest/tests/provision022.py b/pactest/tests/provision022.py
index 190a8b66..4883d428 100644
--- a/pactest/tests/provision022.py
+++ b/pactest/tests/provision022.py
@@ -10,6 +10,6 @@ self.addpkg2db("local", lp)
 
 self.args = "-S %s" % p.name
 
-self.addrule("PACMAN_RETCODE=0")
+self.addrule("PACMAN_RETCODE=1")
 self.addrule("!PKG_EXIST=pkg1")
 self.addrule("PKG_EXIST=pkg2")
diff --git a/pactest/tests/sync1008.py b/pactest/tests/sync1008.py
index 90c61dfb..a6064597 100644
--- a/pactest/tests/sync1008.py
+++ b/pactest/tests/sync1008.py
@@ -14,6 +14,6 @@ self.addpkg2db("sync1", sp3)
 
 self.args = "-S pkg"
 
-self.addrule("PACMAN_RETCODE=0")
+self.addrule("PACMAN_RETCODE=1")
 self.addrule("!PKG_EXIST=pkg")
 self.addrule("!PKG_EXIST=cpkg")
diff --git a/pactest/tests/sync300.py b/pactest/tests/sync300.py
index 36d6758a..31b520a8 100644
--- a/pactest/tests/sync300.py
+++ b/pactest/tests/sync300.py
@@ -9,6 +9,6 @@ self.addpkg2db("sync", sp2)
 
 self.args = "-S %s" % sp1.name
 
-self.addrule("PACMAN_RETCODE=0")
+self.addrule("PACMAN_RETCODE=1")
 self.addrule("!PKG_EXIST=pkg1")
 self.addrule("!PKG_EXIST=pkg2")
diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index e83a97d2..8b611f1a 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -275,7 +275,7 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2,
 				printf(_(":: the following package(s) cannot be upgraded due to "
 						"unresolvable dependencies:\n"));
 				list_display("     ", namelist);
-				*response = yesno(_("\nDo you want to skip the above "
+				*response = noyes(_("\nDo you want to skip the above "
 							"package(s) for this upgrade?"));
 				alpm_list_free(namelist);
 			}