'poldek',
'rpm-build',
'pdksh',
+ 'mksh',
'coreutils'
]
def uninstall_self_conflict(b):
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 -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,
+ 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(),
- 'package' : packagename,
+ 'topdir' : b.get_topdir(),
'spec': b.spec,
})
# java-sun >= 1.5 conflicts with soprano-2.1.67-1.src
# 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)\(.*')
- packagename = b.spec[:-5]
- tmpdir = os.environ.get('HOME') + "/rpm/BUILD/%s/tmp" % packagename
- chroot.run("install -m 700 -d %s" % tmpdir)
- cmd = "set -e; TMPDIR=%(tmpdir)s rpmbuild --nobuild %(rpmdefs)s rpm/packages/%(package)s/%(spec)s 2>&1" % {
+ tmpdir = b.tmpdir()
+ cmd = "set -e; TMPDIR=%(tmpdir)s rpmbuild --nobuild %(rpmdefs)s %(topdir)s/%(spec)s 2>&1" % {
'tmpdir': tmpdir,
+ 'topdir' : b.get_topdir(),
'rpmdefs' : b.rpmbuild_opts(),
- 'package' : packagename,
'spec': b.spec,
}
f = chroot.popen(cmd)
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 --test --noask --caplookup -Q -v --upgrade %s" % br, user = "root")
+ f = chroot.popen("poldek --test --test --noask --caplookup -Q -v %s --upgrade %s" % (b.ignores(), 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
br = string.strip(nbr)
b.log_line("installing BR: %s" % br)
- res = chroot.run("poldek --noask --caplookup -Q -v --upgrade %s" % br,
+ res = chroot.run("set -x; poldek --noask --caplookup -Q -v %s --upgrade %s" % (b.ignores(), br),
user = "root",
logfile = b.logfile)
if res != 0: