Merged from trunk -r13621:13623

   | 13622   | Enable FEATURES=assume-digests by default.                   |
   | zmedico |                                                              |

   | 13623   | Add some really big integers to the vercmp tests.            |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=13624

diff --git a/cnf/make.globals b/cnf/make.globals
index d97e07945076ee459543cf73cb8f5427493c2d78..66935ca8f853a5d056e30a7ad0db443143724d4d 100644 (file)
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -38,8 +38,8 @@ FETCHCOMMAND="@PORTAGE_WGET@ -t 5 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\
 RESUMECOMMAND="@PORTAGE_WGET@ -c -t 5 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\""
 
 # Default user options
-FEATURES="distlocks fixpackages parallel-fetch protect-owned sandbox
-          sfperms strict unmerge-orphans userfetch"
+FEATURES="assume-digests distlocks fixpackages parallel-fetch protect-owned
+          sandbox sfperms strict unmerge-orphans userfetch"
 
 # Ignore file collisions in /lib/modules since files inside this directory
 # are never unmerged, and therefore collisions must be ignored in order for

diff --git a/pym/portage/tests/versions/test_vercmp.py b/pym/portage/tests/versions/test_vercmp.py
index d8837b85243b603ba3091b0a6824fb0942b061e2..2d57236e10e9ca49ec2c629a903d5ef13e064881 100644 (file)
--- a/pym/portage/tests/versions/test_vercmp.py
+++ b/pym/portage/tests/versions/test_vercmp.py
@@ -14,7 +14,8 @@ class VerCmpTestCase(TestCase):
                
                tests = [ ( "6.0", "5.0"), ("5.0","5"),
                        ("1.0-r1", "1.0-r0"),
-                       ("1.0-r1", "1.0")]
+                       ("1.0-r1", "1.0"),
+                       ("999999999999999999999999999999", "999999999999999999999999999998"),]
                for test in tests:
                        self.failIf( vercmp( test[0], test[1] ) <= 0, msg="%s < %s? Wrong!" % (test[0],test[1]) )
 
@@ -26,6 +27,7 @@ class VerCmpTestCase(TestCase):
                        ("1.0_alpha2", "1.0_p2"),("1.0_alpha1", "1.0_beta1"),("1.0_beta3","1.0_rc3"),
                        ("1.001000000000000000001", "1.001000000000000000002"),
                        ("1.00100000000", "1.0010000000000000001"),
+                       ("999999999999999999999999999998", "999999999999999999999999999999"),
                        ("1.01", "1.1"),
                        ("1.0-r0", "1.0-r1"),
                        ("1.0", "1.0-r1")]