Use startswith instead of slice or find.

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

diff --git a/pym/portage.py b/pym/portage.py
index 3b90e88b9e8e604143edda9312b3d12600e130bc..c9d55ae768c87b38e83a468fc265ff8448f55297 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6493,13 +6493,13 @@ class dblink:
                        if stat.S_ISLNK(mymode):
                                # we are merging a symbolic link
                                myabsto=abssymlink(mysrc)
-                               if myabsto[0:len(srcroot)]==srcroot:
+                               if myabsto.startswith(srcroot):
                                        myabsto=myabsto[len(srcroot):]
                                        if myabsto[0]!="/":
                                                myabsto="/"+myabsto
                                myto=os.readlink(mysrc)
                                if self.settings and self.settings["D"]:
-                                       if myto.find(self.settings["D"])==0:
+                                       if myto.startswith(self.settings["D"]):
                                                myto=myto[len(self.settings["D"]):]
                                # myrealto contains the path of the real file to which this symlink points.
                                # we can simply test for existence of this file to see if the target has been merged yet