summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNagy Gabor <ngaba@bibl.u-szeged.hu>2009-04-18 17:35:08 +0200
committerDan McGee <dan@archlinux.org>2009-05-18 23:11:43 -0500
commit0bf340f73c1b1705ab9314955c931a83e15fecb3 (patch)
treefd4cb62553eb21e9425d129657b4cc7d8a500e08
parent882bff36acad5c47df5b35fd3afb411dc4f092b0 (diff)
Remove unused error codes and handle PM_ERR_RETRIEVE by alpm_strerror()
Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--lib/libalpm/alpm.h9
-rw-r--r--lib/libalpm/error.c17
2 files changed, 2 insertions, 24 deletions
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index 48b6ba2f..57ea8806 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -487,31 +487,22 @@ enum _pmerrno_t {
PM_ERR_TRANS_NOT_PREPARED,
PM_ERR_TRANS_ABORT,
PM_ERR_TRANS_TYPE,
- PM_ERR_TRANS_COMMITING,
- PM_ERR_TRANS_DOWNLOADING,
/* Packages */
PM_ERR_PKG_NOT_FOUND,
PM_ERR_PKG_IGNORED,
PM_ERR_PKG_INVALID,
PM_ERR_PKG_OPEN,
- PM_ERR_PKG_LOAD,
- PM_ERR_PKG_CANT_FRESH,
PM_ERR_PKG_CANT_REMOVE,
PM_ERR_PKG_INVALID_NAME,
PM_ERR_PKG_REPO_NOT_FOUND,
/* Deltas */
PM_ERR_DLT_INVALID,
PM_ERR_DLT_PATCHFAILED,
- /* Groups */
- PM_ERR_GRP_NOT_FOUND,
/* Dependencies */
PM_ERR_UNSATISFIED_DEPS,
PM_ERR_CONFLICTING_DEPS,
PM_ERR_FILE_CONFLICTS,
/* Misc */
- PM_ERR_USER_ABORT,
- PM_ERR_INTERNAL_ERROR,
- PM_ERR_DB_SYNC,
PM_ERR_RETRIEVE,
PM_ERR_INVALID_REGEX,
/* External library errors */
diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c
index 01dc758c..47f07508 100644
--- a/lib/libalpm/error.c
+++ b/lib/libalpm/error.c
@@ -99,10 +99,6 @@ const char SYMEXPORT *alpm_strerror(int err)
return _("transaction aborted");
case PM_ERR_TRANS_TYPE:
return _("operation not compatible with the transaction type");
- case PM_ERR_TRANS_COMMITING:
- return _("could not commit transaction");
- case PM_ERR_TRANS_DOWNLOADING:
- return _("could not download all files");
/* Packages */
case PM_ERR_PKG_NOT_FOUND:
return _("could not find or read package");
@@ -112,10 +108,6 @@ const char SYMEXPORT *alpm_strerror(int err)
return _("invalid or corrupted package");
case PM_ERR_PKG_OPEN:
return _("cannot open package file");
- case PM_ERR_PKG_LOAD:
- return _("cannot load package data");
- case PM_ERR_PKG_CANT_FRESH:
- return _("package not installed or lesser version");
case PM_ERR_PKG_CANT_REMOVE:
return _("cannot remove all files for package");
case PM_ERR_PKG_INVALID_NAME:
@@ -127,9 +119,6 @@ const char SYMEXPORT *alpm_strerror(int err)
return _("invalid or corrupted delta");
case PM_ERR_DLT_PATCHFAILED:
return _("delta patch failed");
- /* Groups */
- case PM_ERR_GRP_NOT_FOUND:
- return _("group not found");
/* Dependencies */
case PM_ERR_UNSATISFIED_DEPS:
return _("could not satisfy dependencies");
@@ -138,10 +127,8 @@ const char SYMEXPORT *alpm_strerror(int err)
case PM_ERR_FILE_CONFLICTS:
return _("conflicting files");
/* Miscellaenous */
- case PM_ERR_USER_ABORT:
- return _("user aborted the operation");
- case PM_ERR_INTERNAL_ERROR:
- return _("internal error");
+ case PM_ERR_RETRIEVE:
+ return _("failed to retrieve some files");
case PM_ERR_INVALID_REGEX:
return _("invalid regular expression");
/* Errors from external libraries- our own wrapper error */