pld-builder.new: PLD_Builder/srpm_builder.py - do not hardcode $HOME of bui...

[glen]

Author: glen                         Date: Tue Feb  9 17:21:47 2010 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- do not hardcode $HOME of builder

---- Files affected:
pld-builder.new/PLD_Builder:
   srpm_builder.py (1.69 -> 1.70) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/srpm_builder.py
diff -u pld-builder.new/PLD_Builder/srpm_builder.py:1.69 pld-builder.new/PLD_Builder/srpm_builder.py:1.70
--- pld-builder.new/PLD_Builder/srpm_builder.py:1.69	Mon Oct  5 21:37:36 2009
+++ pld-builder.new/PLD_Builder/srpm_builder.py	Tue Feb  9 18:21:42 2010
@@ -120,10 +120,11 @@
                         (b.branch, pref, b.spec), logfile = b.logfile)
     if res == 0:
         transfer_file(r, b)
-    packagedir = "/home/users/builder/rpm/packages/%s" % b.spec[:-5]
-    chroot.run("cd %s; rpmbuild --nodeps --nobuild --define '_specdir %s' --define '_sourcedir %s' " \
-            "--clean --rmspec --rmsource %s" % \
-            (packagedir, packagedir, packagedir, b.spec), logfile = b.logfile)
+    packagedir = "rpm/packages/%s" % b.spec[:-5]
+    packagename = b.spec[:-5]
+    chroot.run("rpmbuild --nodeps --nobuild --define '_specdir %%{_topdir}/%%{name}' --define '_sourcedir %%{_specdir}' " \
+            "--clean --rmspec --rmsource %s/%s" % \
+            (packagedir, b.spec), logfile = b.logfile)
     chroot.run("rm -rf %s" % packagedir, logfile = b.logfile)
     status.pop()
     if res:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/srpm_builder.py?r1=1.69&r2=1.70&f=u