Stupid me, shouldn't jsut move a part of the patch

svn path=/main/trunk/; revision=5512

diff --git a/pym/portage.py b/pym/portage.py
index 21b8d181739e79ae33806fc4faa072a67d32b34c..0f6f183764917f2b8691ca24dfcf23c0f5cc6095 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -3818,19 +3818,6 @@ def getCPFromCPV(mycpv):
        """Calls pkgsplit on a cpv and returns only the cp."""
        return pkgsplit(mycpv)[0]
 
-def cpvequal(cpv1, cpv2):
-       split1 = catpkgsplit(cpv1)
-       split2 = catpkgsplit(cpv2)
-       
-       if not split1 or not split2:
-               raise portage_exception.PortageException("Invalid data, parameter was not a CPV")
-       
-       if split1[0] != split2[0]:
-               return False
-       
-       return (pkgcmp(split1[1:], split2[1:]) == 0)
-
-
 def dep_virtual(mysplit, mysettings):
        "Does virtual dependency conversion"
        newsplit=[]

diff --git a/pym/portage_dep.py b/pym/portage_dep.py
index 60b75e03a509456cbbc1b38e00b4c233ee88882d..0a103841936767086d47af3c618d59ee6b025517 100644 (file)
--- a/pym/portage_dep.py
+++ b/pym/portage_dep.py
@@ -22,6 +22,18 @@ import re, string, sys, types
 import portage_exception
 from portage_versions import catpkgsplit, catsplit, pkgcmp, pkgsplit, ververify
 
+def cpvequal(cpv1, cpv2):
+       split1 = catpkgsplit(cpv1)
+       split2 = catpkgsplit(cpv2)
+       
+       if not split1 or not split2:
+               raise portage_exception.PortageException("Invalid data, parameter was not a CPV")
+       
+       if split1[0] != split2[0]:
+               return False
+       
+       return (pkgcmp(split1[1:], split2[1:]) == 0)
+
 def strip_empty(myarr):
        """
        Strip all empty elements from an array