summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Malcolm <dmalcolm@redhat.com>2010-03-13 20:51:19 -0500
committerDavid Malcolm <dmalcolm@redhat.com>2010-03-13 20:51:19 -0500
commita6f98b20bfbc195844104a69bf0cf2b69936a0a0 (patch)
tree8d7ba94adc7529f5b7c54fcb219ecd1e83520930
parentdd563ec45e6cbbe7655dfafd7862640b21a02260 (diff)
downloadrpm-pyconfig-a6f98b20bfbc195844104a69bf0cf2b69936a0a0.tar.gz
rpm-pyconfig-a6f98b20bfbc195844104a69bf0cf2b69936a0a0.tar.xz
rpm-pyconfig-a6f98b20bfbc195844104a69bf0cf2b69936a0a0.zip
Use "conf" for all vars; use only the real configs for now
-rwxr-xr-xrpm-pyconfig32
1 files changed, 21 insertions, 11 deletions
diff --git a/rpm-pyconfig b/rpm-pyconfig
index 840d81d..d6d168d 100755
--- a/rpm-pyconfig
+++ b/rpm-pyconfig
@@ -30,22 +30,32 @@ if options.verbose:
# FIXME: this would eventually come from /etc/rpm-pyconfig.d/*.conf
-configs = [PyConfig('python2.6', 'python26', 'standard build of Python 2.6'),
- PyConfig('python2.6-dbg', 'python26-dbg', 'debug build of Python 2.6'),
- PyConfig('python2.7', 'python27', 'standard build of Python 2.7'),
- PyConfig('python2.7-dbg', 'python27-dbg', 'debug build of Python 2.7'),
- PyConfig('python3.1', 'python31', 'standard build of Python 3.1'),
- PyConfig('python3.1-dbg', 'python31-dbg', 'debug build of Python 3.1'),
- PyConfig('python3.2', 'python32', 'standard build of Python 3.2'),
- PyConfig('python3.2-dbg', 'python32-dbg', 'debug build of Python 3.2'),
+if 1:
+ # The two Fedora 13 python runtimes
+ configs = [PyConfig('python2.6', 'python2', 'Python 2'),
+ PyConfig('python3.1', 'python3', 'Python 3'),
+ ]
+if 0:
+ # Combinatorial fun - but what will we want in the future?
+ configs = [PyConfig('python2.6', 'python26', 'standard build of Python 2.6'),
+ PyConfig('python2.6-dbg', 'python26-dbg', 'debug build of Python 2.6'),
+ PyConfig('python2.7', 'python27', 'standard build of Python 2.7'),
+ PyConfig('python2.7-dbg', 'python27-dbg', 'debug build of Python 2.7'),
+ PyConfig('python3.1', 'python31', 'standard build of Python 3.1'),
+ PyConfig('python3.1-dbg', 'python31-dbg', 'debug build of Python 3.1'),
+ PyConfig('python3.2', 'python32', 'standard build of Python 3.2'),
+ PyConfig('python3.2-dbg', 'python32-dbg', 'debug build of Python 3.2'),
]
def do_eval(conf, fmt):
# use "@" as the metacharacter, to avoid confusion with shell "$" and
# specfiles "%"
- fmt = fmt.replace('@binname', conf.binname)
- fmt = fmt.replace('@pkgname', conf.pkgname)
- fmt = fmt.replace('@description', conf.description)
+ fmt = fmt.replace('@confbin', conf.binname)
+ fmt = fmt.replace('@confpkg', conf.pkgname)
+ fmt = fmt.replace('@confdescline',
+ "This package is for the %s" % conf.description)
+ fmt = fmt.replace('@confdesc', conf.description)
+
print fmt
if options.foreach: