]>
Commit | Line | Data |
---|---|---|
1 | --- rpm-4.4.9/rpmdb/rpmdb.c.orig 2007-06-18 20:32:27.000000000 +0200 | |
2 | +++ rpm-4.4.9/rpmdb/rpmdb.c 2007-06-18 20:34:07.000000000 +0200 | |
3 | @@ -3088,7 +3088,6 @@ | |
4 | HAE_t hae = (HAE_t) headerAddEntry; | |
5 | HFD_t hfd = headerFreeData; | |
6 | sigset_t signalMask; | |
7 | - uint32_t hcolor = 0; | |
8 | const char ** baseNames; | |
9 | rpmTagType bnt; | |
10 | const char ** dirNames; | |
11 | @@ -3122,8 +3121,8 @@ | |
12 | } | |
13 | ||
14 | /* Add the package color if not present. */ | |
15 | - if (!hge(h, RPMTAG_PACKAGECOLOR, &bnt, (void **) &hcolor, &count)) { | |
16 | - hcolor = hGetColor(h); | |
17 | + if (!headerIsEntry(h, RPMTAG_PACKAGECOLOR)) { | |
18 | + uint32_t hcolor = hGetColor(h); | |
19 | xx = hae(h, RPMTAG_PACKAGECOLOR, RPM_INT32_TYPE, &hcolor, 1); | |
20 | } | |
21 |