pld-builder.new: PLD_Builder/install.py - no set -x to avoid cron mail output

glen glen at pld-linux.org
Mon Jun 25 08:22:28 CEST 2012


Author: glen                         Date: Mon Jun 25 06:22:28 2012 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- no set -x to avoid cron mail output

---- Files affected:
pld-builder.new/PLD_Builder:
   install.py (1.28 -> 1.29) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/install.py
diff -u pld-builder.new/PLD_Builder/install.py:1.28 pld-builder.new/PLD_Builder/install.py:1.29
--- pld-builder.new/PLD_Builder/install.py:1.28	Sat Mar 24 01:52:50 2012
+++ pld-builder.new/PLD_Builder/install.py	Mon Jun 25 08:22:23 2012
@@ -102,7 +102,7 @@
     b.log_line("checking BuildConflict-ing packages")
     packagename = b.spec[:-5]
     tmpdir = os.environ.get('HOME') + "/rpm/BUILD/%s/tmp" % packagename
-    f = chroot.popen("set -ex; TMPDIR=%(tmpdir)s rpmbuild -bp --nobuild --short-circuit --define 'prep exit 0' %(rpmdefs)s rpm/packages/%(package)s/%(spec)s 2>&1" % {
+    f = chroot.popen("set -e; TMPDIR=%(tmpdir)s rpmbuild -bp --nobuild --short-circuit --define 'prep exit 0' %(rpmdefs)s rpm/packages/%(package)s/%(spec)s 2>&1" % {
         'tmpdir': tmpdir,
         'rpmdefs' : b.rpmbuild_opts(),
         'package' : packagename,
@@ -131,7 +131,7 @@
         packagename = b.spec[:-5]
         tmpdir = os.environ.get('HOME') + "/rpm/BUILD/%s/tmp" % packagename
         chroot.run("install -m 700 -d %s" % tmpdir)
-        cmd = "set -ex; TMPDIR=%(tmpdir)s rpmbuild --nobuild %(rpmdefs)s rpm/packages/%(package)s/%(spec)s 2>&1" % {
+        cmd = "set -e; TMPDIR=%(tmpdir)s rpmbuild --nobuild %(rpmdefs)s rpm/packages/%(package)s/%(spec)s 2>&1" % {
             'tmpdir': tmpdir,
             'rpmdefs' : b.rpmbuild_opts(),
             'package' : packagename,
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/pld-builder.new/PLD_Builder/install.py?r1=1.28&r2=1.29



More information about the pld-cvs-commit mailing list