[projects/pld-builder.new/new-builddir-new: 12/21] Merge branch 'master' into new-builddir

[draenog]

commit 9b426e89788d8dd6c4eb3eb104c95411fd20910b
Merge: 266325c ff71f1e
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Oct 21 11:17:28 2012 +0300

    Merge branch 'master' into new-builddir
    
    Conflicts:
    	PLD_Builder/install.py
    	PLD_Builder/request.py
    	PLD_Builder/rpm_builder.py

 .cvsignore                 |  5 -----
 .gitignore                 | 12 +++++-------
 PLD_Builder/.cvsignore     |  1 -
 PLD_Builder/install.py     |  3 +++
 PLD_Builder/rpm_builder.py |  2 +-
 admin/.cvsignore           |  1 -
 6 files changed, 9 insertions(+), 15 deletions(-)
---
diff --cc PLD_Builder/rpm_builder.py
index e1a6cd8,5d879c1..2323af9
--- a/PLD_Builder/rpm_builder.py
+++ b/PLD_Builder/rpm_builder.py
@@@ -178,12 -178,14 +178,12 @@@ def build_rpm(r, b)
      fetch_src(r, b)
      b.log_line("installing srpm: %s" % b.src_rpm)
      res = chroot.run("""
 -        # b.id %(bid)s
          set -ex;
 -        install -d rpm/packages/%(package)s rpm/BUILD/%(package)s;
 +        install -d %(topdir)s/{BUILD,RPMS};
-         rpm -Uhv %(rpmdefs)s %(src_rpm)s;
+         rpm -Uhv --nodeps %(rpmdefs)s %(src_rpm)s;
          rm -f %(src_rpm)s;
      """ % {
 -        'bid' : b.b_id,
 -        'package' : packagename,
 +        'topdir' : b._topdir,
          'rpmdefs' : b.rpmbuild_opts(),
          'src_rpm' : b.src_rpm
      }, logfile = b.logfile)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/pld-builder.new.git/commitdiff/6fbf8d5befabd83f4260bf17d230d8b32ec42ec2