Skip to content

Commit

Permalink
Merge branch 'p4-encoding'
Browse files Browse the repository at this point in the history
* p4-encoding:
  remove unicodedata.normalize and add comments
  Force changlist fed to perforce p4 client -i to be ascii.
  • Loading branch information
Dustin J. Mitchell committed May 25, 2010
2 parents 38eaa63 + 1377fe9 commit e40becc
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions buildbot/slave/commands/vcs.py
Expand Up @@ -1823,6 +1823,19 @@ def doVCFull(self):
command.extend(['-P', Obfuscated(self.p4passwd, "XXXXXXXX")])
command.extend(['client', '-i'])
log.msg(client_spec)

# from bdbaddog in github comments:
# I'm pretty sure the issue is that perforce client specs can't be
# non-ascii (unless you configure at initial config to be unicode). I
# floated a question to perforce mailing list. From reading the
# internationalization notes..
# http://www.perforce.com/perforce/doc.092/user/i18nnotes.txt
# I'm 90% sure that's the case.
# (http://github.com/bdbaddog/buildbot/commit/8420149b2b804efcf5f81a13e18aa62da0424d21)

# Clean client spec to plain ascii
client_spec=client_spec.encode('ascii','ignore')

c = ShellCommand(self.builder, command, self.builder.basedir,
environ=env, sendRC=False, timeout=self.timeout,
maxTime=self.maxTime, initialStdin=client_spec,
Expand Down

0 comments on commit e40becc

Please sign in to comment.