[Buildbot-commits] buildbot/buildbot/slave commands.py,1.83,1.84

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/slave
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25519/buildbot/slave

Modified Files:
	commands.py 
Log Message:
[project @ commands.P4: use p4user to construct the Owner field of the view, rather than LOGNAME. Closes #40.]

Original author: warner at lothar.com
Date: 2007-08-07 23:49:53+00:00

Index: commands.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/slave/commands.py,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- commands.py	4 Jul 2007 05:52:04 -0000	1.83
+++ commands.py	7 Aug 2007 23:50:40 -0000	1.84
@@ -2156,7 +2156,7 @@
     ['p4user'] (optional): user to use for access
     ['p4passwd'] (optional): passwd to try for the user
     ['p4client'] (optional): client spec to use
-    ['p4views'] (optional): client views to use
+    ['p4extra_views'] (optional): additional client views to use
     """
 
     header = "p4"
@@ -2171,7 +2171,6 @@
         self.p4extra_views = args['p4extra_views']
         self.p4mode = args['mode']
         self.p4branch = args['branch']
-        self.p4logname = os.environ['LOGNAME']
 
         self.sourcedata = str([
             # Perforce server.
@@ -2236,8 +2235,8 @@
         command = ['p4']
         client_spec = ''
         client_spec += "Client: %s\n\n" % self.p4client
-        client_spec += "Owner: %s\n\n" % self.p4logname
-        client_spec += "Description:\n\tCreated by %s\n\n" % self.p4logname
+        client_spec += "Owner: %s\n\n" % self.p4user
+        client_spec += "Description:\n\tCreated by %s\n\n" % self.p4user
         client_spec += "Root:\t%s\n\n" % self.builder.basedir
         client_spec += "Options:\tallwrite rmdir\n\n"
         client_spec += "LineEnd:\tlocal\n\n"