diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2011-08-29 14:04:28 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2011-08-29 14:04:28 +0300 |
| commit | 25e68ab6e28ba3a167ea77924c8c752564d79fab (patch) | |
| tree | 97900a8ee6ee49d4d06329554ea5fb1e03eaac08 /lib/rpmfs.h | |
| parent | 5ee6b23f573bfeafbc56f78c698622b35932b2c2 (diff) | |
| download | rpm-25e68ab6e28ba3a167ea77924c8c752564d79fab.tar.gz | |
Use correct file state for colored file replacements
- On colored file conflict resolution, the non-preferred colored
file state would depend on installation order: if non-preferred
arch is installed first, and the preferred arch in another
transaction, the non-preferred color would get marked "replaced"
indicating a forced install when none was used. This fixes
the file state in such cases to "wrong color" to be consistent
of the other installation scenarios.
Diffstat (limited to 'lib/rpmfs.h')
| -rw-r--r-- | lib/rpmfs.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/rpmfs.h b/lib/rpmfs.h index 129bc657b..ef478ad1d 100644 --- a/lib/rpmfs.h +++ b/lib/rpmfs.h @@ -16,6 +16,7 @@ struct sharedFileInfo_s { int pkgFileNum; int otherPkg; int otherFileNum; + char rstate; }; #ifdef __cplusplus @@ -32,7 +33,8 @@ RPM_GNUC_INTERNAL rpm_count_t rpmfsFC(rpmfs fs); RPM_GNUC_INTERNAL -void rpmfsAddReplaced(rpmfs fs, int pkgFileNum, int otherPkg, int otherFileNum); +void rpmfsAddReplaced(rpmfs fs, int pkgFileNum, char rstate, + int otherPkg, int otherFileNum); RPM_GNUC_INTERNAL sharedFileInfo rpmfsGetReplaced(rpmfs fs); |