* apt-pkg/policy.cc:

  - accept generic release pin expressions again in -t (Closes: #644166)

diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index 6a5130d485aace66d6e84016f666fac3036abf4b..a369bea83bbb63cd872cc56e182ac7e934c86ef0 100644 (file)
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -64,7 +64,8 @@ pkgPolicy::pkgPolicy(pkgCache *Owner) : Pins(0), PFPriority(0), Cache(Owner)
       {
         if ((F->Archive != 0 && vm.ExpressionMatches(DefRel, F.Archive()) == true) ||
             (F->Codename != 0 && vm.ExpressionMatches(DefRel, F.Codename()) == true) ||
-            (F->Version != 0 && vm.ExpressionMatches(DefRel, F.Version()) == true))
+            (F->Version != 0 && vm.ExpressionMatches(DefRel, F.Version()) == true) ||
+            (DefRel.length() > 2 && DefRel[1] == '='))
            found = true;
       }
       if (found == false)

diff --git a/debian/changelog b/debian/changelog
index 3c895813faf21c81923a5eef98684628c493bf4a..6a27ff49a0d7ea3c1df37e15cbf9f5581a475d87 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,10 @@ apt (0.8.15.9) UNRELEASED; urgency=low
     - if a package is garbage, don't try to save it with FixByInstall
   * apt-pkg/init.cc:
     - silently ignore *.orig and *.save files by default
+  * apt-pkg/policy.cc:
+    - accept generic release pin expressions again in -t (Closes: #644166)
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 21 Sep 2011 19:36:45 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Mon, 03 Oct 2011 23:35:40 +0200
 
 apt (0.8.15.8) unstable; urgency=low
 

diff --git a/test/integration/test-bug-407511-fail-invalid-default-release b/test/integration/test-bug-407511-fail-invalid-default-release
index d0a73af7db284f3a67995e642af51cb96cbe0689..7f23a1e82ef85a1f8f3378e8e510d1a9250b4fed 100755 (executable)
--- a/test/integration/test-bug-407511-fail-invalid-default-release
+++ b/test/integration/test-bug-407511-fail-invalid-default-release
@@ -23,18 +23,31 @@ getreleaseversionfromsuite() {
        fi
 }
 
+getlabelfromsuite() {
+       if [ "$SUITE" = 'unstable' ]; then
+               echo -n 'UnstableTestcases'
+       else
+               echo -n 'Testcases'
+       fi
+}
+
 setupaptarchive
 
 passdist() {
-       msgtest "Test that target-release is accepted" $1
+       msgtest 'Test that target-release is accepted' $1
        aptget dist-upgrade -t $1 -qq && msgpass || msgfail
+       msgtest 'Test that target-release pins with' $1
+       aptcache policy -t $1 | grep -q ' 990' && msgpass || msgfail
 }
 
 faildist() {
-       msgtest "Test that target-release is refused" $1
+       msgtest 'Test that target-release is refused' $1
        aptget dist-upgrade -t $1 -qq 2> /dev/null && msgfail || msgpass
 }
 
+msgtest 'Test that no default-release is active in this test' 'setup'
+aptcache policy | grep -q ' 990' && msgfall || msgpass
+
 passdist unstable
 passdist sid
 faildist sidd
@@ -45,3 +58,9 @@ passdist 42*
 passdist 4*.0
 faildist 21.0
 faildist 21*
+# we accept, but don't validate the following
+passdist a=unstable
+passdist n=sid
+passdist v=42.0
+passdist c=main
+passdist l=UnstableTestcases