From b9b3d7d73fb10a40644f0750b967352f2a68be4b Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 10 Jun 1996 04:55:43 +0100 Subject: [PATCH] dpkg (1.2.5); priority=MEDIUM * Allow, but do not create, packages in half-installed state with no version number. (Aargh.) -- Ian Jackson Mon, 10 Jun 1996 04:55:43 +0100 --- debian.Changelog | 7 +++++++ debian.rules | 2 +- lib/parse.c | 5 +++-- main/processarc.c | 2 ++ version.h | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/debian.Changelog b/debian.Changelog index 1ab52334..2fb221da 100644 --- 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 Mon, 10 Jun 1996 04:55:43 +0100 + dpkg (1.2.4); priority=MEDIUM * New dpkg-name from Erick (__.deb convention). diff --git a/debian.rules b/debian.rules index 849bcc6b..873deb25 100755 --- 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 e14db139..499dddfc 100644 --- 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 472753c1..30cdbaca 100644 --- 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 0c40076c..99c63b47 100644 --- 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 */ -- 2.39.5