Parcourir la source

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
Ian Jackson il y a 30 ans
Parent
commit
f01e98af44
7 fichiers modifiés avec 20 ajouts et 13 suppressions
  1. 8 0
      debian.Changelog
  2. 1 1
      debian.rules
  3. 6 8
      lib/dbmodify.c
  4. 2 1
      main/configure.c
  5. 1 1
      main/enquiry.c
  6. 1 1
      main/processarc.c
  7. 1 1
      version.h

+ 8 - 0
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.

+ 1 - 1
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)

+ 6 - 8
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;
 }
 

+ 2 - 1
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;

+ 1 - 1
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"

+ 1 - 1
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. */

+ 1 - 1
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 */