rebuild-scripts bumpspecfile.py,1.5,1.6
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Sat Feb 23 10:40:47 UTC 2008
- Previous message (by thread): rpms/gnustep-make/devel gnustep-make-2.0.4-fhs-fixes.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gnustep-make.spec, 1.3, 1.4 sources, 1.2, 1.3
- Next message (by thread): rebuild-scripts bumpspecfile.py,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mschwendt
Update of /cvs/fedora/rebuild-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25220
Modified Files:
bumpspecfile.py
Log Message:
run rpm --qf only once
Index: bumpspecfile.py
===================================================================
RCS file: /cvs/fedora/rebuild-scripts/bumpspecfile.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- bumpspecfile.py 23 Feb 2008 10:29:31 -0000 1.5
+++ bumpspecfile.py 23 Feb 2008 10:40:46 -0000 1.6
@@ -141,14 +141,13 @@
s.writeFile(aspec)
# Get EVR for changelog entry.
- evr = ''
- epoch = os.popen("LC_ALL=C rpm --specfile -q --qf '%%{epoch}\n' %s | head -1" % aspec).read().strip()
+ rpmqf = os.popen("LC_ALL=C rpm --specfile -q --qf '%%{epoch} %%{version} %%{release}\n' %s | head -1" % aspec).read().strip()
+ (epoch,ver,rel) = rpmqf.split(' ')
if epoch != '(none)':
- evr += str(epoch)+':'
- ver = os.popen("LC_ALL=C rpm --specfile -q --qf '%%{version}\n' %s | head -1" % aspec).read().strip()
- evr += ver
- rel = os.popen("LC_ALL=C rpm --specfile -q --qf '%%{release}\n' --define 'dist %%{nil}' %s | head -1" % aspec).read().strip()
- evr += '-'+rel
+ evr = str(epoch)+':'
+ else:
+ evr = ''
+ evr += ver+'-'+rel
s.addChangelogEntry(evr, opts.comment, userstring)
s.writeFile(aspec)
- Previous message (by thread): rpms/gnustep-make/devel gnustep-make-2.0.4-fhs-fixes.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gnustep-make.spec, 1.3, 1.4 sources, 1.2, 1.3
- Next message (by thread): rebuild-scripts bumpspecfile.py,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list