dpkg (1.2.5); priority=MEDIUM

  * Allow, but do not create, packages in half-installed state
    with no version number.  (Aargh.)

 -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Mon, 10 Jun 1996 04:55:43 +0100

diff --git a/debian.Changelog b/debian.Changelog
index 1ab52334813b093876588f0dfe8fa123b8f90b2b..2fb221dad36e56d79148a0ea2e4fb343b3833aac 100644 (file)
--- a/debian.Changelog
+++ b/debian.Changelog
@@ -1,3 +1,10 @@
+dpkg (1.2.5); priority=MEDIUM
+
+  * Allow, but do not create, packages in half-installed state
+    with no version number.  (Aargh.)
+
+ -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Mon, 10 Jun 1996 04:55:43 +0100
+
 dpkg (1.2.4); priority=MEDIUM
 
   * New dpkg-name from Erick (<pkg>_<version>_<arch>.deb convention).

diff --git a/debian.rules b/debian.rules
index 849bcc6bd58a43c8197117122b75f9da37d4b8c9..873deb25fa96d6fd4150d020cec69cb25378c033 100755 (executable)
--- a/debian.rules
+++ b/debian.rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 package=dpkg
-version=1.2.4
+version=1.2.5
 
 archi=$(shell dpkg --print-architecture)
 DIR:=$(shell pwd)

diff --git a/lib/parse.c b/lib/parse.c
index e14db139f8161b8acac05e266c4c1f7b62aefad0..499dddfc3cad0a4cefeb5d1fecec37d2162b5ae9 100644 (file)
--- a/lib/parse.c
+++ b/lib/parse.c
@@ -197,8 +197,9 @@ int parsedb(const char *filename, enum parsedbflags flags,
                      &newpifp->description, "description");
       parsemustfield(file,filename,lno, warnto,warncount,&newpig,1,
                      &newpifp->maintainer, "maintainer");
-      parsemustfield(file,filename,lno, warnto,warncount,&newpig,0,
-                     &newpifp->version.version, "version");
+      if (newpig.status != stat_halfinstalled)
+        parsemustfield(file,filename,lno, warnto,warncount,&newpig,0,
+                       &newpifp->version.version, "version");
     }
     if (flags & pdb_recordavailable)
       parsemustfield(file,filename,lno, warnto,warncount,&newpig,1,

diff --git a/main/processarc.c b/main/processarc.c
index 472753c142a03be48067356c23e7b3341c5f4bec..30cdbaca553c687046c60cbbfde8de8b0c816ec5 100644 (file)
--- a/main/processarc.c
+++ b/main/processarc.c
@@ -421,6 +421,8 @@ void process_archive(const char *filename) {
   }
 
   pkg->eflag |= eflagf_reinstreq;
+  if (pkg->status == stat_notinstalled)
+    pkg->installed.version= pkg->available.version;
   pkg->status= stat_halfinstalled;
   modstatdb_note(pkg);
   if (oldversionstatus == stat_notinstalled) {

diff --git a/version.h b/version.h
index 0c40076c8ca68a829b0838adfbcb0faa50595400..99c63b47827fe4bf2c8239fdfaf3ef53433791ff 100644 (file)
--- a/version.h
+++ b/version.h
@@ -1 +1 @@
-#define DPKG_VERSION "1.2.4" /* This line modified by Makefile */
+#define DPKG_VERSION "1.2.5" /* This line modified by Makefile */