diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2008-10-13 13:29:30 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2008-10-13 13:29:30 +0300 |
| commit | ebac62541ce0ce4e7877f4a7341cfe0ef6587941 (patch) | |
| tree | 2d82c98fda9d7a7b8529b7f7e12eace07dc1d29d | |
| parent | 511b60edd2317af20c0eeb7471563baab7271585 (diff) | |
| download | rpm-4.4.x.tar.gz | |
Honor default nopromote setting everywhere in rpmds (rhbz#466503)rpm-4.4.x
- Of four different ways to create a dependency set, only rpmdsNew()
explicitly set ds->nopromote to the expected value from global
_rpmds_nopromote defaulting to on. All others fell back to legacy
"epoch promotion" behavior inherited from xcalloc()...
- backported from d28c8fdfb82e45e63a82df7a0e6bc74af4a3cd87
| -rw-r--r-- | lib/rpmds.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/rpmds.c b/lib/rpmds.c index a668a6c5b..afdc5f662 100644 --- a/lib/rpmds.c +++ b/lib/rpmds.c @@ -476,6 +476,7 @@ rpmds rpmdsThis(Header h, rpmTag tagN, int_32 Flags) ds->Type = Type; ds->tagN = tagN; ds->Count = 1; + ds->nopromote = _rpmds_nopromote; ds->N = N; ds->Nt = -1; /* XXX to insure that hfd will free */ ds->EVR = EVR; @@ -528,6 +529,7 @@ rpmds rpmdsSingle(rpmTag tagN, const char * N, const char * EVR, int_32 Flags) ds->BT = now; } ds->Count = 1; + ds->nopromote = _rpmds_nopromote; /*@-assignexpose@*/ /*@-boundswrite@*/ ds->N = xmalloc(sizeof(*ds->N)); ds->N[0] = N; @@ -825,6 +827,7 @@ static rpmds rpmdsDup(const rpmds ods) ds->i = ods->i; ds->l = ods->l; ds->u = ods->u; + ds->nopromote = ods->nopromote; nb = (ds->Count+1) * sizeof(*ds->N); ds->N = (ds->h != NULL |