- fixed a regression with pacman 2.x (reworked patch from VMiklos <vmiklos@frugalware.org>):

if pacman is desiganted as a target in a sysupgrade operation, it should be able to upgrade itself first upon user request.
- removed uneeded sanity checks in alpm interface calls
- replaced printf by MSG in pacman

2 files changed, 8 insertions, 2 deletions

diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c
index 833737f4..7dca7ffd 100644
--- a/lib/libalpm/alpm.c
+++ b/lib/libalpm/alpm.c
@@ -719,8 +719,6 @@ int alpm_logaction(char *fmt, ...)
 
 PMList *alpm_list_first(PMList *list)
 {
-	ASSERT(list != NULL, return(NULL));
-
 	return(list);
 }
 
@@ -740,10 +738,17 @@ void *alpm_list_getdata(PMList *entry)
 
 int alpm_list_free(PMList *entry)
 {
+	ASSERT(entry != NULL, return(-1));
+
 	FREELIST(entry);
 
 	return(0);
 }
+
+int alpm_list_count(PMList *list)
+{
+	return(_alpm_list_count(list));
+}
 /** @} */
 
 /** @defgroup alpm_misc Miscellaneous Functions
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index 454fdc09..09034067 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -300,6 +300,7 @@ PM_LIST *alpm_list_first(PM_LIST *list);
 PM_LIST *alpm_list_next(PM_LIST *entry);
 void *alpm_list_getdata(PM_LIST *entry);
 int alpm_list_free(PM_LIST *entry);
+int alpm_list_count(PM_LIST *list);
 
 /* md5sums */
 char *alpm_get_md5sum(char *name);