Combine reading from depends and desc in sync db

This will allow us to eventually combine the depends and desc entries
within the sync database.

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

1 files changed, 2 insertions, 7 deletions

diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c
index 851d7b83..bd8d132d 100644
--- a/lib/libalpm/be_sync.c
+++ b/lib/libalpm/be_sync.c
@@ -239,7 +239,7 @@ int _alpm_sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entry
 		return(-1);
 	}
 
-	if(strcmp(filename, "desc") == 0) {
+	if(strcmp(filename, "desc") == 0 || strcmp(filename, "depends") == 0) {
 		while(_alpm_archive_fgets(line, sizeof(line), archive) != NULL) {
 			_alpm_strtrim(line);
 			if(strcmp(line, "%NAME%") == 0) {
@@ -354,12 +354,7 @@ int _alpm_sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entry
 				if(!pkg->epoch) {
 					pkg->epoch = 1;
 				}
-			}
-		}
-	} else if(strcmp(filename, "depends") == 0) {
-		while(_alpm_archive_fgets(line, sizeof(line), archive) != NULL) {
-			_alpm_strtrim(line);
-			if(strcmp(line, "%DEPENDS%") == 0) {
+			} else if(strcmp(line, "%DEPENDS%") == 0) {
 				while(_alpm_archive_fgets(line, sizeof(line), archive) &&
 							strlen(_alpm_strtrim(line))) {
 					pmdepend_t *dep = _alpm_splitdep(_alpm_strtrim(line));