moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-11-11 20:05:07 -05:00
Code Issues Releases Wiki Activity

Make reading from any file possible in sync DB

Browse Source 
Whether it be "desc", "depends", or "deltas", it really doesn't matter-
treat them all the same and have the ability to read any data from any file
in that list. This continues the work in a44c7b8956.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2010-12-12 20:38:20 -06:00
parent 9f96c5433a
commit 3030542d10
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/libalpm/be_sync.c
View File

@ -238,7 +238,8 @@ int _alpm_sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entry
return(-1); return(-1);
} }
if(strcmp(filename, "desc") == 0 || strcmp(filename, "depends") == 0) { if(strcmp(filename, "desc") == 0 || strcmp(filename, "depends") == 0
|| strcmp(filename, "deltas") == 0) {
while(_alpm_archive_fgets(line, sizeof(line), archive) != NULL) { while(_alpm_archive_fgets(line, sizeof(line), archive) != NULL) {
_alpm_strtrim(line); _alpm_strtrim(line);
if(strcmp(line, "%NAME%") == 0) { if(strcmp(line, "%NAME%") == 0) {
@ -380,19 +381,14 @@ int _alpm_sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entry
STRDUP(linedup, _alpm_strtrim(line), goto error); STRDUP(linedup, _alpm_strtrim(line), goto error);
pkg->provides = alpm_list_add(pkg->provides, linedup); pkg->provides = alpm_list_add(pkg->provides, linedup);
} }
} } else if(strcmp(line, "%DELTAS%") == 0) {
} while(_alpm_archive_fgets(line, sizeof(line), archive) && strlen(_alpm_strtrim(line))) {
} else if(strcmp(filename, "deltas") == 0) { pmdelta_t *delta = _alpm_delta_parse(line);
while(_alpm_archive_fgets(line, sizeof(line), archive) != NULL) { if(delta) {
_alpm_strtrim(line); pkg->deltas = alpm_list_add(pkg->deltas, delta);
if(strcmp(line, "%DELTAS%") == 0) {
while(_alpm_archive_fgets(line, sizeof(line), archive) && strlen(_alpm_strtrim(line))) {
pmdelta_t *delta = _alpm_delta_parse(line);
if(delta) {
pkg->deltas = alpm_list_add(pkg->deltas, delta);
}
} }
} }
}
} }
} else { } else {
/* unknown database file */ /* unknown database file */