From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 22 Nov 2013 16:22:28 +0000 (+0000)
Subject: perforce: Fix path subdirectory issues
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=40e06dc459d9c0b5d42d65b2d2c846196fd36b1f;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

perforce: Fix path subdirectory issues

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>
---

diff --git a/lib/bb/fetch2/perforce.py b/lib/bb/fetch2/perforce.py
index ac1bfc7df86..7491a536003 100644
--- a/lib/bb/fetch2/perforce.py
+++ b/lib/bb/fetch2/perforce.py
@@ -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)