diff options
| -rwxr-xr-x | scripts/check-for-type-punning-warnings.py | 2 | ||||
| -rwxr-xr-x | scripts/load_every_help.py | 20 |
2 files changed, 10 insertions, 12 deletions
diff --git a/scripts/check-for-type-punning-warnings.py b/scripts/check-for-type-punning-warnings.py index 3ac48e0c..a108e369 100755 --- a/scripts/check-for-type-punning-warnings.py +++ b/scripts/check-for-type-punning-warnings.py @@ -44,7 +44,7 @@ mailoutput.append('http://autobuild.puredata.info/auto-build/' + date + '/logs/' # upload the log file to the autobuild website rsyncfile = 'rsync://128.238.56.50/upload/' + date + '/logs/' + outputfilename cmd = ['rsync', '-axv', outputfile, rsyncfile] -mailoutput.append(str(cmd)) +mailoutput.append(' '.join(cmd) + '\n') p = subprocess.Popen(cmd, shell=False, stdout=subprocess.PIPE, diff --git a/scripts/load_every_help.py b/scripts/load_every_help.py index b4857ecd..7ffa2934 100755 --- a/scripts/load_every_help.py +++ b/scripts/load_every_help.py @@ -209,17 +209,15 @@ mailoutput.append('http://autobuild.puredata.info/auto-build/' + date + '/logs/' # upload the log file to the autobuild website rsyncfile = 'rsync://128.238.56.50/upload/' + date + '/logs/' + outputfilename -try: - p = subprocess.Popen(['rsync', '-ax', outputfile, rsyncfile], - stdout=subprocess.PIPE, stderr=subprocess.STDOUT).wait() -except: - mailoutput.append('rsync upload of the log failed!\n') - -# try to output the rsync log -try: - mailoutput.append(''.join(p.stdout.readlines())) -except: - pass +cmd = ['rsync', '-axv', outputfile, rsyncfile] +mailoutput.append(' '.join(cmd) + '\n') +p = subprocess.Popen(cmd, + shell=False, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) +p.wait() +mailoutput.append(''.join(p.stdout.readlines())) +mailoutput.append(''.join(p.stderr.readlines())) mailoutput.append('______________________________________________________________________\n\n') |