diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-03-27 04:30:54 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-27 04:30:54 +0000 |
| commit | 9e42bdf7273dc2e3180e37e622789317945b1ced (patch) | |
| tree | 6ac4d1a315ee023a1ddaabf5abceb07755dbd8ce /pym | |
| parent | Add test case for consecutive hyphens. (trunk r13186) (diff) | |
| download | portage-multirepo-9e42bdf7273dc2e3180e37e622789317945b1ced.tar.gz portage-multirepo-9e42bdf7273dc2e3180e37e622789317945b1ced.tar.bz2 portage-multirepo-9e42bdf7273dc2e3180e37e622789317945b1ced.zip | |
Bug #227265 - Make pkgsplit() allow multiple consecutive hyphens in package
names, and add corresponding test cases. (trunk r13187)
svn path=/main/branches/2.1.6/; revision=13216
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/tests/dep/test_isvalidatom.py | 6 | ||||
| -rw-r--r-- | pym/portage/versions.py | 8 |
2 files changed, 5 insertions, 9 deletions
diff --git a/pym/portage/tests/dep/test_isvalidatom.py b/pym/portage/tests/dep/test_isvalidatom.py index a10d730b..e74ec8ff 100644 --- a/pym/portage/tests/dep/test_isvalidatom.py +++ b/pym/portage/tests/dep/test_isvalidatom.py @@ -64,8 +64,10 @@ class IsValidAtom(TestCase): ( "=null/portage-2.1*", True ), ( "=foo/bar-123-1", True ), ( "=foo/bar-123-1-r1", True ), - ( "=foo/bar--baz-1-r1", False ), - ( "=foo/bar-baz--1-r1", False ), + ( "=foo/bar--baz-1-r1", True ), + ( "=foo/bar-baz--1-r1", True ), + ( "=foo/bar-baz---1-r1", True ), + ( "=foo/bar-baz---1", True ), ( "=foo/bar-baz-1--r1", False ), ] diff --git a/pym/portage/versions.py b/pym/portage/versions.py index a5f4c6c1..d3f256dc 100644 --- a/pym/portage/versions.py +++ b/pym/portage/versions.py @@ -219,13 +219,7 @@ def pkgsplit(mypkg,silent=1): print "!!! Name error in",mypkg+": missing a version or name part." pkgcache[mypkg]=None return None - for x in myparts: - if len(x)==0: - if not silent: - print "!!! Name error in",mypkg+": empty \"-\" part." - pkgcache[mypkg]=None - return None - + #verify rev revok=0 myrev=myparts[-1] |