Resolve conflict, bah

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

diff --git a/pym/portage/versions.py b/pym/portage/versions.py
index 8b5ad3422aa333512b42f9259aec48b8d518dbdf..b520936f6de0bb4b352c122c0f916f760256d3c5 100644 (file)
--- a/pym/portage/versions.py
+++ b/pym/portage/versions.py
@@ -257,38 +257,8 @@ def pkgsplit(mypkg,silent=1):
        if m is None:
                return None
 
-<<<<<<< .working
-       #verify rev
-       revok=0
-       myrev=myparts[-1]
-       if len(myrev) and myrev[0]=="r":
-               try:
-                       # PREFIX hack: allow floats in revisions
-                       float(myrev[1:])
-                       revok=1
-               except ValueError: # from int()
-                       pass
-       if revok:
-               verPos = -2
-               revision = myparts[-1]
-       else:
-               verPos = -1
-               revision = "r0"
-
-       if ververify(myparts[verPos]):
-               if len(myparts)== (-1*verPos):
-                       pkgcache[mypkg]=None
-                       return None
-               else:
-                       myval=("-".join(myparts[:verPos]),myparts[verPos],revision)
-                       pkgcache[mypkg]=myval
-                       return myval
-       else:
-               pkgcache[mypkg]=None
-=======
        if m.group('pn_inval') is not None:
                # package name appears to have a version-like suffix
->>>>>>> .merge-right.r14472
                return None
 
        rev = m.group('rev')