From f01e98af44f6e43f63a595da34233c7a544a7ce7 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian@chiark.chu.cam.ac.uk>
Date: Thu, 27 Jun 1996 13:39:36 +0100
Subject: [PATCH] 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
---
 debian.Changelog  |  8 ++++++++
 debian.rules      |  2 +-
 lib/dbmodify.c    | 14 ++++++--------
 main/configure.c  |  3 ++-
 main/enquiry.c    |  2 +-
 main/processarc.c |  2 +-
 version.h         |  2 +-
 7 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/debian.Changelog b/debian.Changelog
index 62943858..4edd6ddb 100644
--- 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 6d69154b..1fd69f43 100755
--- 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 54bb36a2..819d4db4 100644
--- 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 d0e3b2b6..dbd79f56 100644
--- 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 ce3c3dd7..16cd91b2 100644
--- 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 9a79394d..8f77b542 100644
--- 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 52585be5..0c01a69b 100644
--- 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 */
-- 
2.39.5