]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
perforce: Fix path subdirectory issues
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 22 Nov 2013 16:22:28 +0000 (16:22 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 22 Nov 2013 16:24:11 +0000 (16:24 +0000)
With a SRC_URI = " \
p4://depot/folder/...;module=localfolder/localsubfolder;changeslist=${P4CHANGELIST} \
"

the subfolders of //depot/folder/... get renamed when mapped to the
local folder structure. They lose the first 3 letters. This
patch fixes that.

Issue reported by and patch sent from katutxakurra@gmail.com

[YOCTO #5380]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
lib/bb/fetch2/perforce.py

index ac1bfc7df86b1a9060e4d46707af1381a1fdf840..7491a5360030e0a9ee125ab88ec65059b9c2f573 100644 (file)
@@ -112,7 +112,7 @@ class Perforce(FetchMethod):
         base = path
         which = path.find('/...')
         if which != -1:
-            base = path[:which]
+            base = path[:which-1]
 
         base = self._strip_leading_slashes(base)