extras-buildsys/utils extras-push-new,1.34,1.35
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Sat Jun 10 21:11:26 UTC 2006
Author: mschwendt
Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12299
Modified Files:
extras-push-new
Log Message:
make excludearch stuff work also in DEBUG mode
Index: extras-push-new
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- extras-push-new 10 Jun 2006 20:40:16 -0000 1.34
+++ extras-push-new 10 Jun 2006 21:11:23 -0000 1.35
@@ -477,10 +477,12 @@
print "Copying packages into place:"
infolist = [] # list of src.rpm NEVR for build report
+ srpmlocdict = {} # debug only
for package in files['srpm']:
(n,a,e,v,r) = naevr(package)
infolist.append('%s-%s-%s' % (n,v,r))
pkg_fn = os.path.basename(package)
+ srpmlocdict[pkg_fn] = package # debug only
destloc = os.path.join(destdir, 'SRPMS', pkg_fn)
debugmove(signtmpdir+package,destloc)
@@ -500,7 +502,10 @@
if opts.excludearch_for_noarch:
hdr = rpmUtils.miscutils.hdrFromPackage(ts,package)
source_rpm = hdr['sourcerpm']
- srpmloc = os.path.join(destdir, 'SRPMS', source_rpm)
+ if not DEBUG:
+ srpmloc = os.path.join(destdir, 'SRPMS', source_rpm)
+ else: # in debug mode we cannot access signed/installed rpms
+ srpmloc = srpmlocdict[source_rpm]
hdr = rpmUtils.miscutils.hdrFromPackage(ts,srpmloc)
excludearch = hdr['excludearch']
linkloc = None
More information about the scm-commits
mailing list