diff options
| author |   Thomas Kahle <tomka@gentoo.org> | 2012-02-11 17:55:56 +0100 |
|---|---|---|
| committer | Thomas Kahle <tomka@gentoo.org> | 2012-02-11 17:55:56 +0100 |
| commit | 6de4df97a275f7857ad1f7991e3bcf8f36b23bd6 (patch) | |
| tree | 1fe7c522a4401ddddbb5fdbac7f8133662d3d7b2 /tatt | |
| parent | Fix a function call (diff) | |
| download | tatt-6de4df97a275f7857ad1f7991e3bcf8f36b23bd6.tar.gz tatt-6de4df97a275f7857ad1f7991e3bcf8f36b23bd6.tar.bz2 tatt-6de4df97a275f7857ad1f7991e3bcf8f36b23bd6.zip | |
Snippet 2 support for multiple versions
Diffstat (limited to 'tatt')
| -rw-r--r-- | tatt/scriptwriter.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tatt/scriptwriter.py b/tatt/scriptwriter.py index 8a88100..0e575ce 100644 --- a/tatt/scriptwriter.py +++ b/tatt/scriptwriter.py @@ -143,6 +143,8 @@ def writecommitscript (job, config): packageHash[pack.packageCatName()] = packageHash[pack.packageCatName()] + [pack] else: packageHash[pack.packageCatName()] = [pack] + # Prepare a list of ebuild names strings + ebuilds = [p.packageName()+"-"+p.packageVersion()+".ebuild" for p in packageHash[pack]] # First round (ekeyword) for pack in packageHash.keys(): s = csnippet.replace("@@BUG@@", job.bugnumber) @@ -155,17 +157,17 @@ def writecommitscript (job, config): print "No job type? Can't continue. This is a bug" exit(1) s = s.replace("@@NEWKEYWORD@@", newkeyword) - ebuilds = [p.packageName()+"-"+p.packageVersion()+".ebuild" for p in packageHash[pack]] s = s.replace("@@EBUILD@@", " ".join(ebuilds)) s = s.replace("@@CP@@", pack) outfile.write(s) - # Second round (repoman -d full checks) - for pack in job.packageList: + # Second round: repoman -d full checks and commit, should be done once per + # key of packageHash + for packCN in packageHash.keys(): s = csnippet2.replace("@@BUG@@", job.bugnumber) s = s.replace("@@ARCH@@", config['arch']) s = s.replace("@@NEWKEYWORD@@", newkeyword) - s = s.replace("@@EBUILD@@", pack.packageName()+"-"+pack.packageVersion()+".ebuild") - s = s.replace("@@CP@@", pack.packageCatName()) + s = s.replace("@@EBUILD@@", " ".join(ebuilds)) + s = s.replace("@@CP@@", packCN) outfile.write(s) # Footer (committing) outfile.write (commitfooterfile.read().replace("@@ARCH@@", config['arch']).replace("@@BUG@@", job.bugnumber)) |