From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 13 Jul 2006 04:09:59 +0000 (-0000)
Subject: Use startswith instead of slice or find.
X-Git-Tag: v2.1.1~238
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d1290ebb30fc5a6b066db7898f7c25446e016fe1;p=portage.git

Use startswith instead of slice or find.

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

diff --git a/pym/portage.py b/pym/portage.py
index 3b90e88b9..c9d55ae76 100644
--- 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