fix database rebuilds with triggers (Steve Sanberg).

CVS patchset: 2290
CVS date: 1998/09/11 07:57:41

diff --git a/CHANGES b/CHANGES
index 6105210..896cadb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,7 @@
        - create /usr/lib/rpm directory and move rpmrc et al there
 
 2.5.3 -> 2.5.4:
+       - fix database rebuilds with triggers (Steve Sanberg).
        - diagnostic message if unreadable/short source or patch file.
        - eliminate redundant close in provide/require processing.
        - solaris portability patch resurrection (Steve Sanberg).

diff --git a/lib/messages.c b/lib/messages.c
index d0b693b..fe75e70 100644 (file)
--- a/lib/messages.c
+++ b/lib/messages.c
@@ -67,6 +67,14 @@ void rpmMessage(int level, char * format, ...) {
            fflush(stderr);
            exit(1);
            break;
+
+         default:
+           fprintf(stderr, _("internal error (rpm bug?): "));
+           vfprintf(stderr, format, args);
+           fflush(stderr);
+           exit(1);
+           break;
+
        }
     }
 }

diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index bac3fa7..3be130d 100644 (file)
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -654,5 +654,9 @@ int rpmdbMoveDatabase(char * rootdir, char * olddbpath, char * newdbpath) {
     sprintf(nfilename, "%s/%s/conflictsindex.rpm", rootdir, newdbpath);
     if (rename(ofilename, nfilename)) rc = 1;
 
+    sprintf(ofilename, "%s/%s/triggerindex.rpm", rootdir, olddbpath);
+    sprintf(nfilename, "%s/%s/triggerindex.rpm", rootdir, newdbpath);
+    if (rename(ofilename, nfilename)) rc = 1;
+
     return rc;
 }

diff --git a/rpmio/messages.c b/rpmio/messages.c
index d0b693b..fe75e70 100644 (file)
--- a/rpmio/messages.c
+++ b/rpmio/messages.c
@@ -67,6 +67,14 @@ void rpmMessage(int level, char * format, ...) {
            fflush(stderr);
            exit(1);
            break;
+
+         default:
+           fprintf(stderr, _("internal error (rpm bug?): "));
+           vfprintf(stderr, format, args);
+           fflush(stderr);
+           exit(1);
+           break;
+
        }
     }
 }