| 1 |
Author: zmedico |
| 2 |
Date: 2009-03-26 01:40:22 +0000 (Thu, 26 Mar 2009) |
| 3 |
New Revision: 13187 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/tests/dep/test_isvalidatom.py |
| 7 |
main/trunk/pym/portage/versions.py |
| 8 |
Log: |
| 9 |
Bug #227265 - Make pkgsplit() allow multiple consecutive hyphens in package |
| 10 |
names, and add corresponding test cases. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/pym/portage/tests/dep/test_isvalidatom.py |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/pym/portage/tests/dep/test_isvalidatom.py 2009-03-25 23:50:16 UTC (rev 13186) |
| 16 |
+++ main/trunk/pym/portage/tests/dep/test_isvalidatom.py 2009-03-26 01:40:22 UTC (rev 13187) |
| 17 |
@@ -64,8 +64,10 @@ |
| 18 |
( "=null/portage-2.1*", True ), |
| 19 |
( "=foo/bar-123-1", True ), |
| 20 |
( "=foo/bar-123-1-r1", True ), |
| 21 |
- ( "=foo/bar--baz-1-r1", False ), |
| 22 |
- ( "=foo/bar-baz--1-r1", False ), |
| 23 |
+ ( "=foo/bar--baz-1-r1", True ), |
| 24 |
+ ( "=foo/bar-baz--1-r1", True ), |
| 25 |
+ ( "=foo/bar-baz---1-r1", True ), |
| 26 |
+ ( "=foo/bar-baz---1", True ), |
| 27 |
( "=foo/bar-baz-1--r1", False ), |
| 28 |
] |
| 29 |
|
| 30 |
|
| 31 |
Modified: main/trunk/pym/portage/versions.py |
| 32 |
=================================================================== |
| 33 |
--- main/trunk/pym/portage/versions.py 2009-03-25 23:50:16 UTC (rev 13186) |
| 34 |
+++ main/trunk/pym/portage/versions.py 2009-03-26 01:40:22 UTC (rev 13187) |
| 35 |
@@ -219,13 +219,7 @@ |
| 36 |
print "!!! Name error in",mypkg+": missing a version or name part." |
| 37 |
pkgcache[mypkg]=None |
| 38 |
return None |
| 39 |
- for x in myparts: |
| 40 |
- if len(x)==0: |
| 41 |
- if not silent: |
| 42 |
- print "!!! Name error in",mypkg+": empty \"-\" part." |
| 43 |
- pkgcache[mypkg]=None |
| 44 |
- return None |
| 45 |
- |
| 46 |
+ |
| 47 |
#verify rev |
| 48 |
revok=0 |
| 49 |
myrev=myparts[-1] |
Archives