diff options
Diffstat (limited to 'bitbake/lib/bb/fetch2/perforce.py')
-rw-r--r-- | bitbake/lib/bb/fetch2/perforce.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/bb/fetch2/perforce.py b/bitbake/lib/bb/fetch2/perforce.py index da6d337461..e2a41a4a12 100644 --- a/bitbake/lib/bb/fetch2/perforce.py +++ b/bitbake/lib/bb/fetch2/perforce.py | |||
@@ -90,16 +90,16 @@ class Perforce(FetchMethod): | |||
90 | p4port = d.getVar('P4PORT') | 90 | p4port = d.getVar('P4PORT') |
91 | 91 | ||
92 | if p4port: | 92 | if p4port: |
93 | logger.debug(1, 'Using recipe provided P4PORT: %s' % p4port) | 93 | logger.debug('Using recipe provided P4PORT: %s' % p4port) |
94 | ud.host = p4port | 94 | ud.host = p4port |
95 | else: | 95 | else: |
96 | logger.debug(1, 'Trying to use P4CONFIG to automatically set P4PORT...') | 96 | logger.debug('Trying to use P4CONFIG to automatically set P4PORT...') |
97 | ud.usingp4config = True | 97 | ud.usingp4config = True |
98 | p4cmd = '%s info | grep "Server address"' % ud.basecmd | 98 | p4cmd = '%s info | grep "Server address"' % ud.basecmd |
99 | bb.fetch2.check_network_access(d, p4cmd, ud.url) | 99 | bb.fetch2.check_network_access(d, p4cmd, ud.url) |
100 | ud.host = runfetchcmd(p4cmd, d, True) | 100 | ud.host = runfetchcmd(p4cmd, d, True) |
101 | ud.host = ud.host.split(': ')[1].strip() | 101 | ud.host = ud.host.split(': ')[1].strip() |
102 | logger.debug(1, 'Determined P4PORT to be: %s' % ud.host) | 102 | logger.debug('Determined P4PORT to be: %s' % ud.host) |
103 | if not ud.host: | 103 | if not ud.host: |
104 | raise FetchError('Could not determine P4PORT from P4CONFIG') | 104 | raise FetchError('Could not determine P4PORT from P4CONFIG') |
105 | 105 | ||
@@ -208,7 +208,7 @@ class Perforce(FetchMethod): | |||
208 | for filename in p4fileslist: | 208 | for filename in p4fileslist: |
209 | item = filename.split(' - ') | 209 | item = filename.split(' - ') |
210 | lastaction = item[1].split() | 210 | lastaction = item[1].split() |
211 | logger.debug(1, 'File: %s Last Action: %s' % (item[0], lastaction[0])) | 211 | logger.debug('File: %s Last Action: %s' % (item[0], lastaction[0])) |
212 | if lastaction[0] == 'delete': | 212 | if lastaction[0] == 'delete': |
213 | continue | 213 | continue |
214 | filelist.append(item[0]) | 214 | filelist.append(item[0]) |
@@ -255,7 +255,7 @@ class Perforce(FetchMethod): | |||
255 | raise FetchError('Could not determine the latest perforce changelist') | 255 | raise FetchError('Could not determine the latest perforce changelist') |
256 | 256 | ||
257 | tipcset = tip.split(' ')[1] | 257 | tipcset = tip.split(' ')[1] |
258 | logger.debug(1, 'p4 tip found to be changelist %s' % tipcset) | 258 | logger.debug('p4 tip found to be changelist %s' % tipcset) |
259 | return tipcset | 259 | return tipcset |
260 | 260 | ||
261 | def sortable_revision(self, ud, d, name): | 261 | def sortable_revision(self, ud, d, name): |