Merged frugalware changes (too many to list). Also added some config file

handling changes (support [sections] to carry over to included files - this
helps with backwards compatibility with existing pacman config files)

1 files changed, 3 insertions, 1 deletions

diff --git a/lib/libalpm/error.h b/lib/libalpm/error.h
index 312c0c06..bee36076 100644
--- a/lib/libalpm/error.h
+++ b/lib/libalpm/error.h
@@ -21,7 +21,9 @@
 #ifndef _ALPM_ERROR_H
 #define _ALPM_ERROR_H
 
-#define RET_ERR(err, ret) do { pm_errno = (err); return(ret); } while(0)
+#define RET_ERR(err, ret) do { pm_errno = (err); \
+	_alpm_log(PM_LOG_ERROR, _("returning error %d: %s\n"), err, alpm_strerror(err)); \
+	return(ret); } while(0)
 
 #endif /* _ALPM_ERROR_H */