- fix: honor --test when doing --freshen.

CVS patchset: 4158
CVS date: 2000/09/13 17:26:54

diff --git a/CHANGES b/CHANGES
index e9e60ae..a9d05af 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -108,6 +108,7 @@
        - fix: initialize sigs everywhere in python header object.
        - translate rpm.8 man page (Peter Ivanyi <ivanyi@internet.sk>).
        - popt: support for float/double args.
+       - fix: honor --test when doing --freshen.
 
 3.0.4 -> 3.0.5
        - configure.in fiddles for BSD systems (Patrick Schoo).

diff --git a/rpm.c b/rpm.c
index 8916592..97f94b9 100755 (executable)
--- a/rpm.c
+++ b/rpm.c
@@ -1120,7 +1120,7 @@ int main(int argc, const char ** argv)
        if (noDeps) interfaceFlags |= INSTALL_NODEPS;
        if (noOrder) interfaceFlags |= INSTALL_NOORDER;
        if (upgrade) interfaceFlags |= INSTALL_UPGRADE;
-       if (freshen) interfaceFlags |= INSTALL_FRESHEN;
+       if (freshen) interfaceFlags |= (INSTALL_UPGRADE|INSTALL_FRESHEN);
 
        if (!poptPeekArg(optCon))
            argerror(_("no packages given for install"));

diff --git a/rpmqv.c b/rpmqv.c
index fccc2e2..b300aba 100755 (executable)
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -1400,7 +1400,7 @@ int main(int argc, const char ** argv)
        if (noDeps) interfaceFlags |= INSTALL_NODEPS;
        if (noOrder) interfaceFlags |= INSTALL_NOORDER;
        if (upgrade) interfaceFlags |= INSTALL_UPGRADE;
-       if (freshen) interfaceFlags |= INSTALL_FRESHEN;
+       if (freshen) interfaceFlags |= (INSTALL_UPGRADE|INSTALL_FRESHEN);
 
        if (!poptPeekArg(optCon))
            argerror(_("no packages given for install"));