Force changlist fed to perforce p4 client -i to be ascii.

djmitche · May 25, 2010 · d18d4f7 · d18d4f7
1 parent 38eaa63
commit d18d4f7
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/buildbot/slave/commands/vcs.py b/buildbot/slave/commands/vcs.py
@@ -1,4 +1,4 @@
-import os, re, sys, shutil, time
+import os, re, sys, shutil, time, unicodedata
 
 from xml.dom.minidom import parseString
 
@@ -1823,6 +1823,10 @@ def doVCFull(self):
             command.extend(['-P', Obfuscated(self.p4passwd, "XXXXXXXX")])
         command.extend(['client', '-i'])
         log.msg(client_spec)
+
+        # Clean client spec to plain ascii
+        client_spec=unicodedata.normalize('NFKD',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,