Modify pref.copy_clear_rev() behavior

conan-io · Oct 7, 2019 · d8e6b43 · d8e6b43
1 parent 358be67
commit d8e6b43
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/conans/client/graph/graph.py b/conans/client/graph/graph.py
@@ -282,7 +282,7 @@ def new_build_order(self):
             new_level = []
             for n in level:
                 if n.binary == BINARY_BUILD and n.pref not in total_prefs:
-                    new_level.append((n.id, n.pref.copy_with_revs(n.pref.ref.revision, None)))
+                    new_level.append((n.id, n.pref.copy_clear_rev()))
                     total_prefs.add(n.pref)
             if new_level:
                 result.append(new_level)

diff --git a/conans/client/rest/client_routes.py b/conans/client/rest/client_routes.py
@@ -87,15 +87,15 @@ def recipe_snapshot(self, ref):
 
     def package_snapshot(self, pref):
         """get recipe manifest url"""
-        return self.base_url + self._for_package(pref.copy_clear_rev())
+        return self.base_url + self._for_package(pref.copy_clear_revs())
 
     def recipe_manifest(self, ref):
         """get recipe manifest url"""
         return self.base_url + _format_ref(routes.v1_recipe_digest, ref.copy_clear_rev())
 
     def package_manifest(self, pref):
         """get manifest url"""
-        return self.base_url + _format_pref(routes.v1_package_digest, pref.copy_clear_rev())
+        return self.base_url + _format_pref(routes.v1_package_digest, pref.copy_clear_revs())
 
     def recipe_download_urls(self, ref):
         """ urls to download the recipe"""

diff --git a/conans/model/ref.py b/conans/model/ref.py
@@ -290,8 +290,7 @@ def copy_with_revs(self, revision, p_revision):
         return PackageReference(self.ref.copy_with_rev(revision), self.id, p_revision)
 
     def copy_clear_rev(self):
-        ref = self.ref.copy_clear_rev()
-        return PackageReference(ref, self.id, revision=None)
+        return self.copy_with_revs(self.ref.revision, None)
 
     def copy_clear_revs(self):
         return self.copy_with_revs(None, None)

diff --git a/conans/test/integration/revisions_test.py b/conans/test/integration/revisions_test.py
@@ -424,10 +424,10 @@ def test_new_exported_recipe_clears_outdated_packages(self, v1):
         msg = "Removing the local binary packages from different recipe revisions"
         if v1:
             self.assertNotIn(msg, client.out)
-            self.assertTrue(client.package_exists(pref_outdated.copy_clear_rev()))
+            self.assertTrue(client.package_exists(pref_outdated.copy_clear_revs()))
         else:
             self.assertIn(msg, client.out)
-            self.assertFalse(client.package_exists(pref_outdated.copy_clear_rev()))
+            self.assertFalse(client.package_exists(pref_outdated.copy_clear_revs()))
 
         self.assertTrue(client.package_exists(pref_ok))
 
@@ -492,18 +492,18 @@ def test_remove_oudated_packages_locally_removes_orphan_prevs(self):
         layout = self.c_v1.cache.package_layout(pref.ref.copy_clear_rev())
 
         # Assert pref (outdated) is in the cache
-        self.assertTrue(layout.package_exists(pref.copy_clear_rev()))
+        self.assertTrue(layout.package_exists(pref.copy_clear_revs()))
 
         # Assert pref2 is also in the cache
-        self.assertTrue(layout.package_exists(pref2.copy_clear_rev()))
+        self.assertTrue(layout.package_exists(pref2.copy_clear_revs()))
 
         self.c_v1.run("remove {} --outdated -f".format(pref.ref))
 
         # Assert pref (outdated) is not in the cache anymore
-        self.assertFalse(layout.package_exists(pref.copy_clear_rev()))
+        self.assertFalse(layout.package_exists(pref.copy_clear_revs()))
 
         # Assert pref2 is in the cache
-        self.assertTrue(layout.package_exists(pref2.copy_clear_rev()))
+        self.assertTrue(layout.package_exists(pref2.copy_clear_revs()))
 
     @parameterized.expand([(True,), (False,)])
     def test_remove_oudated_packages_remote(self, v1):