# vi: encoding=utf-8 ts=8 sts=4 sw=4 et
-import re
+import re, os
import string
import StringIO
'poldek',
'rpm-build',
'pdksh',
+ 'mksh',
'coreutils'
]
k = killset.keys()
if len(k) == 0:
return True
- rx = re.compile(r' marks ([^\s]+)-[^-]+-[^-]+$')
+ rx = re.compile(r'^.* marks (?P<name>[^\s]+?)-[^-]+-[^-]+\s.*$')
errors = ""
for p in k:
if p in hold:
del killset[p]
errors += "cannot remove %s because it's crucial\n" % p
else:
- f = chroot.popen("poldek --noask --test --erase %s" % p, user = "root")
+ f = chroot.popen("poldek --noask --test --test --erase %s" % p, user = "root")
crucial = 0
e = []
for l in f.xreadlines():
m = rx.search(l)
if m:
- pkg = m.group(1)
+ pkg = m.group('name')
if pkg in hold:
errors += "cannot remove %s because it's required " \
"by %s, that is crucial\n" % (p, pkg)
def upgrade_from_batch(r, b):
f = chroot.popen("rpm --test -F %s 2>&1" % string.join(b.files), user = "root")
killset = {}
- rx = re.compile(r' \(installed\) ([^\s]+)-[^-]+-[^-]+$')
+ rx = re.compile(r' \(installed\) (?P<name>[^\s]+)-[^-]+-[^-]+$')
for l in f.xreadlines():
m = rx.search(l)
- if m: killset[m.group(1)] = 1
+ if m: killset[m.group('name')] = 1
f.close()
if len(killset) != 0:
err = close_killset(killset)
b.log_line("error: conflicting packages uninstallation failed")
return False
else:
- k = string.join(conflicting.keys())
- b.log_line("removing %s" % k)
- res = chroot.run("poldek --noask --erase %s" % k, logfile = b.logfile, user = "root")
- if res != 0:
- b.log_line("package removal failed")
- return False
+ for k in conflicting.keys():
+ b.log_line("removing %s" % k)
+ res = chroot.run("poldek --noask --erase %s" % k, logfile = b.logfile, user = "root")
+ if res != 0:
+ b.log_line("package %s removal failed" % k)
return True
def uninstall_self_conflict(b):
b.log_line("checking BuildConflict-ing packages")
- rpmbuild_opt = "%s %s %s" % (b.target_string(), b.kernel_string(), b.bconds_string())
- tmpdir = "/tmp/BR." + b.b_id[0:6]
- f = chroot.popen("cd rpm/SPECS; TMPDIR=%s rpmbuild -bp --nobuild --short-circuit --define 'prep exit 0' %s %s 2>&1" \
- % (tmpdir, rpmbuild_opt, b.spec))
- rx = re.compile(r".*conflicts with ([^\s]+-[^-]+-[^-]+)\.src$")
+ f = chroot.popen("set -e; TMPDIR=%(tmpdir)s " \
+ "rpmbuild -bp --nobuild --short-circuit --define 'prep exit 0' %(rpmdefs)s %(topdir)s/%(spec)s 2>&1" % {
+ 'tmpdir': b.tmpdir(),
+ 'rpmdefs' : b.rpmbuild_opts(),
+ 'topdir' : b._topdir,
+ 'spec': b.spec,
+ })
+ # java-sun >= 1.5 conflicts with soprano-2.1.67-1.src
+ # java-sun conflicts with soprano-2.1.67-1.src
+ rx = re.compile(r"\s+(?P<name>[\w-]+)\s+.*conflicts with [^\s]+-[^-]+-[^-]+\.src($| .*)")
conflicting = {}
for l in f.xreadlines():
- b.log_line("rpmbuild: %s" % l.rstrip())
m = rx.search(l)
- if m: conflicting[m.group(1)] = 1
+ if m:
+ b.log_line("rpmbuild: %s" % l.rstrip())
+ conflicting[m.group('name')] = 1
f.close()
if len(conflicting) and not uninstall(conflicting, b):
return False
return True
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" \
- % (tmpdir, b.bconds_string(), b.spec)
- f = chroot.popen(cmd)
- rx = re.compile(r"^\s*([^\s]+) .*is needed by")
- needed = {}
- b.log_line("checking BR")
- for l in f.xreadlines():
- b.log_line("rpm: %s" % l.rstrip())
- m = rx.search(l)
- if m and not ignore_br.match(l):
- needed[m.group(1)] = 1
- f.close()
- chroot.run("rm -rf %s" % tmpdir)
+ def get_missing_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 = b.tmpdir()
+ cmd = "set -e; TMPDIR=%(tmpdir)s rpmbuild --nobuild %(rpmdefs)s %(topdir)s/%(spec)s 2>&1" % {
+ 'tmpdir': tmpdir,
+ 'topdir' : b._topdir,
+ 'rpmdefs' : b.rpmbuild_opts(),
+ 'spec': b.spec,
+ }
+ f = chroot.popen(cmd)
+ rx = re.compile(r"^\s*(?P<name>[^\s]+) .*is needed by")
+ needed = {}
+ b.log_line("checking BR")
+ for l in f.xreadlines():
+ b.log_line("rpm: %s" % l.rstrip())
+ m = rx.search(l)
+ if m and not ignore_br.match(l):
+ needed[m.group('name')] = 1
+ f.close()
+ return needed
+
+ needed = get_missing_br(r, b);
+
if len(needed) == 0:
b.log_line("no BR needed")
return True
+
nbr = ""
for bre in needed.keys():
nbr = nbr + " " + re.escape(bre)
chroot.run("poldek --up --upa", user = "root", logfile = b.logfile)
# check conflicts in BRed packages
b.log_line("checking conflicting packages in BRed packages")
- f = chroot.popen("poldek --test --noask --caplookup -Q -v --upgrade %s" % br, user = "root")
- rx = re.compile(r".*conflicts with installed ([^\s]+)-[^-]+-[^-]+$")
+ f = chroot.popen("poldek --test --test --noask --caplookup -Q -v --upgrade %s" % br, user = "root")
+ # phonon-devel-4.3.1-1.i686 conflicts with qt4-phonon-devel-4.5.0-6.i686
+ # jdbc-stdext >= 2.0 is required by installed java-struts-1.3.10-1.noarch
+ # jmx is needed by (installed) java-commons-modeler-2.0-1.noarch
+ rx = re.compile(r".*(conflicts with|is required by|is needed by)( installed| \(installed\)|) (?P<name>[^\s]+)-[^-]+-[^-]+($| .*)")
conflicting = {}
for l in f.xreadlines():
b.log_line("poldek: %s" % l.rstrip())
m = rx.search(l)
- if m: conflicting[m.group(1)] = 1
+ if m: conflicting[m.group('name')] = 1
f.close()
if len(conflicting) == 0:
b.log_line("no conflicts found")
else:
- if not uninstall(conflicting):
+ if not uninstall(conflicting, b):
return False
+
+ # recheck BuildRequires since above uninstallation could remove some required deps
+ needed = get_missing_br(r, b);
+
+ if len(needed) == 0:
+ b.log_line("no BR needed")
+ return True
+
+ nbr = ""
+ for bre in needed.keys():
+ nbr = nbr + " " + re.escape(bre)
+ br = string.strip(nbr)
+
b.log_line("installing BR: %s" % br)
res = chroot.run("poldek --noask --caplookup -Q -v --upgrade %s" % br,
user = "root",
projects / projects / pld-builder.new.git / blobdiff