summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-03-26 01:40:22 +0000
committerZac Medico <zmedico@gentoo.org>2009-03-26 01:40:22 +0000
commit172f1b5c4f1ae5e64098f7e9438d36ebc3c2241f (patch)
tree90e2d1c893f5e4a42229bfdcf66bdeaf6547a1cf
parent299e621e4c94af84b9a60f87af6813ab070e3d67 (diff)
downloadportage-172f1b5c4f1ae5e64098f7e9438d36ebc3c2241f.tar.gz
portage-172f1b5c4f1ae5e64098f7e9438d36ebc3c2241f.tar.bz2
portage-172f1b5c4f1ae5e64098f7e9438d36ebc3c2241f.zip
Bug #227265 - Make pkgsplit() allow multiple consecutive hyphens in package
names, and add corresponding test cases. svn path=/main/trunk/; revision=13187
-rw-r--r--pym/portage/tests/dep/test_isvalidatom.py6
-rw-r--r--pym/portage/versions.py8
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 a10d730b3..e74ec8ff5 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 a5f4c6c1a..d3f256dc0 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]