From: Ian Jackson <ian@chiark.chu.cam.ac.uk>
Date: Wed, 21 Aug 1996 23:39:52 +0000 (+0100)
Subject: dpkg (1.2.14) stable unstable; urgency=MEDIUM
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c496eb18f7cffdb660c341d4b4c1f62fb39d4426;p=dpkg

dpkg (1.2.14) stable unstable; urgency=MEDIUM

  * dselect +/-/_/= on lines for all broken, new, local or whatever
    packages do not affect _all_ packages.  (Bug#4129.)

 -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Thu, 22 Aug 1996 00:39:52 +0100
---

diff --git a/debian.Changelog b/debian.Changelog
index a6dcd133..7ae991d2 100644
--- a/debian.Changelog
+++ b/debian.Changelog
@@ -1,3 +1,10 @@
+dpkg (1.2.14) stable unstable; urgency=MEDIUM
+
+  * dselect +/-/_/= on lines for all broken, new, local or whatever
+    packages do not affect _all_ packages.  (Bug#4129.)
+
+ -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Thu, 22 Aug 1996 00:39:52 +0100
+
 dpkg (1.2.13) unstable; urgency=LOW
 
   * dpkg --search produces correct output for diversions.
diff --git a/debian.rules b/debian.rules
index e6552aa7..992a34f3 100755
--- a/debian.rules
+++ b/debian.rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 package=dpkg
-version=1.2.13
+version=1.2.14
 
 archi=$(shell dpkg --print-architecture)
 DIR:=$(shell pwd)
diff --git a/doc/developer-keys.bak b/doc/developer-keys.bak
deleted file mode 100644
index a62f9c93..00000000
Binary files a/doc/developer-keys.bak and /dev/null differ
diff --git a/dselect/pkgcmds.cc b/dselect/pkgcmds.cc
index 26a32566..7950bb9b 100644
--- a/dselect/pkgcmds.cc
+++ b/dselect/pkgcmds.cc
@@ -33,7 +33,19 @@ extern "C" {
 #include "dselect.h"
 #include "pkglist.h"
 
-static int matches(struct pkginfo *pkg, struct pkginfo *comparewith) {
+int packagelist::affectedmatches(struct pkginfo *pkg, struct pkginfo *comparewith) {
+  switch (statsortorder) {
+  case sso_avail:
+    if (comparewith->clientdata->ssavail != pkg->clientdata->ssavail) return 0;
+    break;
+  case sso_state:
+    if (comparewith->clientdata->ssstate != pkg->clientdata->ssstate) return 0;
+    break;
+  case sso_unsorted:
+    break;
+  default:
+    internerr("unknown statsortorder in affectedmatches");
+  }
   if (comparewith->priority != pkginfo::pri_unset &&
       (comparewith->priority != pkg->priority ||
        comparewith->priority == pkginfo::pri_other &&
@@ -60,7 +72,8 @@ void packagelist::affectedrange(int *startp, int *endp) {
     return;
   }
   *startp= index;
-  while (index < nitems && matches(table[index]->pkg,table[cursorline]->pkg)) index++;
+  while (index < nitems && affectedmatches(table[index]->pkg,table[cursorline]->pkg))
+    index++;
   *endp= index;
 }
 
diff --git a/dselect/pkglist.h b/dselect/pkglist.h
index c93db253..4bfc8435 100644
--- a/dselect/pkglist.h
+++ b/dselect/pkglist.h
@@ -160,6 +160,7 @@ class packagelist : public baselist {
   void addheading(enum ssavailval, enum ssstateval,
                   pkginfo::pkgpriority, const char*, const char *section);
   void sortinplace();
+  int affectedmatches(struct pkginfo *pkg, struct pkginfo *comparewith);
   void affectedrange(int *startp, int *endp);
   void setwant(pkginfo::pkgwant nw);
   void sethold(int hold);
diff --git a/version.h b/version.h
index ac5cd6c6..42be7bd9 100644
--- a/version.h
+++ b/version.h
@@ -1 +1 @@
-#define DPKG_VERSION "1.2.13" /* This line modified by Makefile */
+#define DPKG_VERSION "1.2.14" /* This line modified by Makefile */