diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-21 10:45:56 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-21 11:39:46 +0000 |
| commit | 9861ed37bb1c5d09c3b4852d2a252e3f3c86ab14 (patch) | |
| tree | c8554f9a5f045b702eb50e70aaf577e00c1cbf6b | |
| parent | 7001fdd7c4dca372cbebd8fd2c0b03c5d43f9400 (diff) | |
| download | bitbake-9861ed37bb1c5d09c3b4852d2a252e3f3c86ab14.tar.gz | |
fetch2/perforce: Fix localfile to include ud.module
As reported by Katu Txakur, the output depends on the module path
set so this needs to be accounted for in localfile.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/fetch2/perforce.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/bb/fetch2/perforce.py b/lib/bb/fetch2/perforce.py index 6f3c95b6c..da6d33746 100644 --- a/lib/bb/fetch2/perforce.py +++ b/lib/bb/fetch2/perforce.py @@ -119,6 +119,7 @@ class Perforce(FetchMethod): cleanedpath = ud.path.replace('/...', '').replace('/', '.') cleanedhost = ud.host.replace(':', '.') + cleanedmodule = "" # Merge the path and module into the final depot location if ud.module: if ud.module.find('/') == 0: @@ -133,7 +134,7 @@ class Perforce(FetchMethod): ud.setup_revisions(d) - ud.localfile = d.expand('%s_%s_%s.tar.gz' % (cleanedhost, cleanedpath, ud.revision)) + ud.localfile = d.expand('%s_%s_%s_%s.tar.gz' % (cleanedhost, cleanedpath, cleandedmodule, ud.revision)) def _buildp4command(self, ud, d, command, depot_filename=None): """ |