3 files changed, 12 insertions, 5 deletions

diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c
index 386eee4d..df267e31 100644
--- a/lib/libalpm/alpm.c
+++ b/lib/libalpm/alpm.c
@@ -379,8 +379,13 @@ int alpm_db_update(int force, PM_DB *db)
 		if(_alpm_unpack(path, db->path, NULL)) {
 			RET_ERR(PM_ERR_SYSTEM, 1);
 		}
+
 		/* remove the .tar.gz */
+		/* aaron: let's not do this... we'll keep the DB around to be read for the
+		 * "new and improved" db routines
+		 
 		unlink(path);
+		*/
 	}
 
 	return(0);
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index a0dbe2bd..e3715b42 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -79,6 +79,8 @@ int alpm_logaction(char *fmt, ...);
  * Options
  */
 
+#define PM_DLFNM_LEN 22
+
 /* Parameters */
 enum {
 	PM_OPT_LOGCB = 1,
diff --git a/lib/libalpm/server.c b/lib/libalpm/server.c
index a5ae9e9f..d86002d2 100644
--- a/lib/libalpm/server.c
+++ b/lib/libalpm/server.c
@@ -299,22 +299,22 @@ int _alpm_downloadfiles_forreal(pmlist_t *servers, const char *localpath,
 				struct stat st;
 				snprintf(output, PATH_MAX, "%s/%s.part", localpath, fn);
 				if(pm_dlfnm) {
-					strncpy(pm_dlfnm, fn, 22);
+					strncpy(pm_dlfnm, fn, PM_DLFNM_LEN);
 				}
 				/* drop filename extension */
 				ptr = strstr(fn, PM_EXT_DB);
-				if(pm_dlfnm && ptr && (ptr-fn) < 22) {
+				if(pm_dlfnm && ptr && (ptr-fn) < PM_DLFNM_LEN) {
 					pm_dlfnm[ptr-fn] = '\0';
 				}
 				ptr = strstr(fn, PM_EXT_PKG);
-				if(ptr && (ptr-fn) < 24) {
+				if(ptr && (ptr-fn) < PM_DLFNM_LEN) {
 					pm_dlfnm[ptr-fn] = '\0';
 				}
 				if(pm_dlfnm) {
-					for(j = strlen(pm_dlfnm); j < 22; j++) {
+					for(j = strlen(pm_dlfnm); j < PM_DLFNM_LEN; j++) {
 						(pm_dlfnm)[j] = ' ';
 					}
-					pm_dlfnm[22] = '\0';
+					pm_dlfnm[PM_DLFNM_LEN] = '\0';
 				}
 				if(pm_dloffset) {
 					*pm_dloffset = 0;