Remove lazy loading of deltas

Local packages do not have deltas so remove lazy loading of delta
information.

Signed-off-by: Allan McRae <allan@archlinux.org>

2 files changed, 3 insertions, 26 deletions

diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c
index abf0af4e..af4a220a 100644
--- a/lib/libalpm/be_local.c
+++ b/lib/libalpm/be_local.c
@@ -196,7 +196,8 @@ alpm_list_t *_cache_get_replaces(pmpkg_t *pkg)
 
 alpm_list_t *_cache_get_deltas(pmpkg_t *pkg)
 {
-	LAZY_LOAD(INFRQ_DELTAS, NULL);
+	ASSERT(pkg != NULL, return(NULL));
+	/* local pkgs do not have deltas so nothing to load */
 	return pkg->deltas;
 }
 
@@ -704,29 +705,6 @@ int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 		fp = NULL;
 	}
 
-	/* DELTAS */
-	if(inforeq & INFRQ_DELTAS) {
-		snprintf(path, PATH_MAX, "%sdeltas", pkgpath);
-		if((fp = fopen(path, "r"))) {
-			while(!feof(fp)) {
-				if(fgets(line, sizeof(line), fp) == NULL) {
-					break;
-				}
-				_alpm_strtrim(line);
-				if(strcmp(line, "%DELTAS%") == 0) {
-					while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) {
-						pmdelta_t *delta = _alpm_delta_parse(line);
-						if(delta) {
-							info->deltas = alpm_list_add(info->deltas, delta);
-						}
-					}
-				}
-			}
-			fclose(fp);
-			fp = NULL;
-		}
-	}
-
 	/* INSTALL */
 	if(inforeq & INFRQ_SCRIPTLET) {
 		snprintf(path, PATH_MAX, "%sinstall", pkgpath);
diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h
index 0a120f99..5352e9ee 100644
--- a/lib/libalpm/db.h
+++ b/lib/libalpm/db.h
@@ -37,8 +37,7 @@ typedef enum _pmdbinfrq_t {
 	INFRQ_DEPENDS = (1 << 2),
 	INFRQ_FILES = (1 << 3),
 	INFRQ_SCRIPTLET = (1 << 4),
-	INFRQ_DELTAS = (1 << 5),
-	INFRQ_DSIZE = (1 << 6),
+	INFRQ_DSIZE = (1 << 5),
 	/* ALL should be info stored in the package or database */
 	INFRQ_ALL = 0x3F
 } pmdbinfrq_t;