@@ -80,7 +80,7 @@ private # Execute a P4 command, and return an array of the resulting output lines # The array will contain a hash for each line out output def p4(operation, options = nil) - p4cmd = "p4 -R -p #{@port} -c #{@clientspec} -u #{@username} -P #{@password} " + p4cmd = "p4 -R -p #{@port} -c #{@clientspec} -u #{@username} " + password_args p4cmd << "#{operation.to_s}" p4cmd << " " << options if options @@ -95,6 +95,10 @@ private p4_output end + def password_args + (@password.blank?) ? "" : "-P #{@password} " + end + def info change1 = p4(:changes, "-m 1 #{@p4path}#have").first change2 = p4(:changes, "-m 1 #{@p4path}#head").first perforce.rb 0e36ef595795141f2d20c87058783d0d00bb7698 Ben Curren ben@esomnie.com http://github.com/bcurren/cruisecontrolrb_perforce/commit/46d71ba537888b270e5c8eb8e79b9114533766d1 46d71ba537888b270e5c8eb8e79b9114533766d1 2008-12-18T12:48:56-08:00 2008-12-18T12:48:56-08:00 Thanks kwerle for the patch. Support no password for perforce. 3507225321366073553132810ada9f49afe5ce5e Ben Curren ben@esomnie.com