dpkg (1.2.9); priority=MEDIUM

  * Fixed status database updates reading bug.
  * `Setting up' message includes version number.
  * `existence check' message changed to say `cannot access archive'.

 -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Thu, 27 Jun 1996 13:39:36 +0100

diff --git a/debian.Changelog b/debian.Changelog
index 6294385850335f13a01454a3e5d0ef9da068d4a6..4edd6ddbac8b7c66ef002078cd1875224741de19 100644 (file)
--- a/debian.Changelog
+++ b/debian.Changelog
@@ -1,3 +1,11 @@
+dpkg (1.2.9); priority=MEDIUM
+
+  * Fixed status database updates reading bug.
+  * `Setting up' message includes version number.
+  * `existence check' message changed to say `cannot access archive'.
+
+ -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Thu, 27 Jun 1996 13:39:36 +0100
+
 dpkg (1.2.8); priority=LOW
 
   * dpkg --record-avail puts data in Size field.

diff --git a/debian.rules b/debian.rules
index 6d69154b9c858a1222f40dbda838e15e8d1852d8..1fd69f43fb79129372d71c5f896fe77ede639afd 100755 (executable)
--- a/debian.rules
+++ b/debian.rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 package=dpkg
-version=1.2.8
+version=1.2.9
 
 archi=$(shell dpkg --print-architecture)
 DIR:=$(shell pwd)

diff --git a/lib/dbmodify.c b/lib/dbmodify.c
index 54bb36a2a69ffe7c444d804623dc16b1143dea4a..819d4db479c4b1eb7b2a4a8d0f94f503aa547d21 100644 (file)
--- a/lib/dbmodify.c
+++ b/lib/dbmodify.c
@@ -167,7 +167,12 @@ enum modstatdb_rw modstatdb_init(const char *adir, enum modstatdb_rw readwritere
   strcat(updatefnbuf,"/" UPDATESDIR);
   updatefnrest= updatefnbuf+strlen(updatefnbuf);
 
-  cleanupdates();
+  if (cstatus != msdbrw_needsuperuserlockonly) {
+    cleanupdates();
+    parsedb(availablefile,
+            pdb_recordavailable|pdb_rejectstatus,
+            0,0,0);
+  }
 
   if (cstatus >= msdbrw_write) {
     createimptmp();
@@ -176,13 +181,6 @@ enum modstatdb_rw modstatdb_init(const char *adir, enum modstatdb_rw readwritere
     uvb.buf= m_malloc(uvb.size);
   }
 
-  if (cstatus != msdbrw_needsuperuserlockonly) {
-    parsedb(statusfile, pdb_weakclassification, 0,0,0);
-    parsedb(availablefile,
-            pdb_recordavailable|pdb_rejectstatus,
-            0,0,0);
-  }
-
   return cstatus;
 }
 

diff --git a/main/configure.c b/main/configure.c
index d0e3b2b6e15266112fc319e50a710b21c232f14a..dbd79f562713c49ccf2bc19b9036f3a654881b58 100644 (file)
--- a/main/configure.c
+++ b/main/configure.c
@@ -113,7 +113,8 @@ void deferred_configure(struct pkginfo *pkg) {
                 "Package is in a very bad inconsistent state - you should\n"
                 " reinstall it before attempting configuration.");
 
-  printf("Setting up %s ...\n",pkg->name);
+  printf("Setting up %s (%s) ...\n",pkg->name,
+         versiondescribe(&pkg->installed.version,vdew_never));
 
   if (f_noact) {
     pkg->status= stat_installed;

diff --git a/main/enquiry.c b/main/enquiry.c
index ce3c3dd77cbcb2662720f76a411c6c7dfe5ace93..16cd91b2b3b6ebb024668db876ac899bedef7346 100644 (file)
--- a/main/enquiry.c
+++ b/main/enquiry.c
@@ -455,7 +455,7 @@ void assertpredep(const char *const *argv) {
   switch (pkg->status) {
   case stat_installed:
     break;
-  case stat_unpacked: case stat_halfconfigured:
+  case stat_unpacked: case stat_halfconfigured: case stat_halfinstalled:
     if (versionsatisfied3(&pkg->configversion,&predepversion,dvr_laterequal))
       break;
     printf("Version of dpkg with Pre-Depends support not yet configured.\n"

diff --git a/main/processarc.c b/main/processarc.c
index 9a79394ddf6e9953e8d235c37144927bb07fd664..8f77b542f3d415070d1fdafb3cfd730761549988 100644 (file)
--- a/main/processarc.c
+++ b/main/processarc.c
@@ -101,7 +101,7 @@ void process_archive(const char *filename) {
     pfilename= filename;
   }
 
-  if (stat(filename,&stab)) ohshite("existence check failed");
+  if (stat(filename,&stab)) ohshite("cannot access archive");
 
   if (!f_noact) {
     /* We can't `tentatively-reassemble' packages. */

diff --git a/version.h b/version.h
index 52585be59fe9553c9fa64cb72324816e86f81993..0c01a69b8f9149ed8953126181277ab4593f721f 100644 (file)
--- a/version.h
+++ b/version.h
@@ -1 +1 @@
-#define DPKG_VERSION "1.2.8" /* This line modified by Makefile */
+#define DPKG_VERSION "1.2.9" /* This line modified by Makefile */