pld-builder.new: PLD_Builder/install_br.py Ignore internal rpm dependencies.

[arekm]

Author: arekm                        Date: Tue Jul 22 14:42:10 2008 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
Ignore internal rpm dependencies.

---- Files affected:
pld-builder.new/PLD_Builder:
   install_br.py (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/install_br.py
diff -u pld-builder.new/PLD_Builder/install_br.py:1.23 pld-builder.new/PLD_Builder/install_br.py:1.24
--- pld-builder.new/PLD_Builder/install_br.py:1.23	Thu Jul 17 19:15:49 2008
+++ pld-builder.new/PLD_Builder/install_br.py	Tue Jul 22 16:42:05 2008
@@ -8,6 +8,9 @@
 import upgrade
 
 def install_br(r, b):
+    # ignore internal rpm dependencies, see lib/rpmns.c for list
+    ignore_br = re.compile(r'^\s*(rpmlib|cpuinfo|getconf|uname|soname|user|group|mounted|diskspace|digest|gnupg|macro|envvar|running|sanitycheck|vcheck|signature|verify|exists|executable|readable|writable)\(.*')
+
     tmpdir = "/tmp/BR." + b.b_id[0:6]
     chroot.run("install -m 700 -d %s" % tmpdir)
     cmd = "cd rpm/SPECS; TMPDIR=%s rpmbuild --nobuild %s %s 2>&1" \
@@ -19,7 +22,8 @@
     for l in f.xreadlines():
         b.log_line("rpm: %s" % l.rstrip())
         m = rx.search(l)
-        if m: needed[m.group(1)] = 1
+        if m and not ignore_br.match(l):
+            needed[m.group(1)] = 1
     f.close()
     chroot.run("rm -rf %s" % tmpdir)
     if len(needed) == 0:
================================================================

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