diff options
Diffstat (limited to 'ext/repo_rpmdb.c')
| -rw-r--r-- | ext/repo_rpmdb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/repo_rpmdb.c b/ext/repo_rpmdb.c index 308cfe5..92aef31 100644 --- a/ext/repo_rpmdb.c +++ b/ext/repo_rpmdb.c @@ -54,7 +54,8 @@ /* 3: added triggers */ /* 4: fixed triggers */ /* 5: fixed checksum copying */ -#define RPMDB_COOKIE_VERSION 5 +/* 6: add SOLVABLE_PREREQ_IGNOREINST support */ +#define RPMDB_COOKIE_VERSION 6 #define TAG_NAME 1000 #define TAG_VERSION 1001 @@ -2434,7 +2435,7 @@ rpm_iterate_filelist(void *rpmhandle, int flags, void (*cb)(void *, const char * if ((flags & RPM_ITERATE_FILELIST_WITHCOL) != 0) { co = headint32array(rpmhead, TAG_FILECOLORS, &cnt2); - if (!co || cnt != cnt2) + if (co && cnt != cnt2) { solv_free(co); solv_free(md); @@ -2512,8 +2513,7 @@ rpm_iterate_filelist(void *rpmhandle, int flags, void (*cb)(void *, const char * info.digest = md5; } } - if (co) - info.color = co[i]; + info.color = co ? co[i] : 0; (*cb)(cbdata, space, &info); } solv_free(space); |