rpms/tmda/FC-6 tmda-optionparser.patch,NONE,1.1 tmda.spec,1.2,1.3
Bernard Johnson (bjohnson)
fedora-extras-commits at redhat.com
Sat Feb 24 20:52:10 UTC 2007
Author: bjohnson
Update of /cvs/extras/rpms/tmda/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25946
Modified Files:
tmda.spec
Added Files:
tmda-optionparser.patch
Log Message:
fix -e option parsing
tmda-optionparser.patch:
--- NEW FILE tmda-optionparser.patch ---
TMDA should accept multiple -e options on the same command line
--- tmda-1.1.10/bin/tmda-rfilter 2007-01-17 22:49:44.000000000 +0100
+++ tmda-1.1.10/bin/tmda-rfilter 2007-02-23 11:06:27.000000000 +0100
@@ -81,7 +81,7 @@
FILTER_INCOMING in ~/.tmda/config."""),
make_option("-e", "--environ",
- metavar="VAR=VAL", dest="environ",
+ metavar="VAR=VAL", dest="environ", action="append",
help= \
"""Add an environment variable on the command line. VAR is the name
of the variable, and VAL, separated by an '=', is its value. There
@@ -141,11 +141,12 @@
if opts.filter_incoming:
os.environ['TMDA_FILTER_INCOMING'] = opts.filter_incoming
if opts.environ:
- try:
- key, value = opts.environ.split('=', 1)
- os.environ[key] = value
- except (KeyError, ValueError):
- parser.error('bad environment key-value pair - "%s"' % opts.environ)
+ for pair in opts.environ:
+ try:
+ key, value = pair.split('=', 1)
+ os.environ[key] = value
+ except (KeyError, ValueError):
+ parser.error('bad environment key-value pair - "%s"' % pair)
if opts.vhomescript:
if os.environ.has_key('EXT') and os.environ.has_key('HOST'):
setvuserhomedir(opts.vhomescript)
Index: tmda.spec
===================================================================
RCS file: /cvs/extras/rpms/tmda/FC-6/tmda.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tmda.spec 20 Feb 2007 02:00:37 -0000 1.2
+++ tmda.spec 24 Feb 2007 20:51:38 -0000 1.3
@@ -7,7 +7,7 @@
Name: tmda
Version: 1.1.10
-Release: 4.2%{?dist}%{?repotag:.%{repotag}}
+Release: 5%{?dist}%{?repotag:.%{repotag}}
Summary: Tagged Message Delivery Agent
Group: Applications/System
@@ -15,6 +15,7 @@
URL: http://tmda.net
Source0: http://tmda.net/releases/%{name}-%{version}.tgz
Patch0: tofmipd-init.patch
+Patch1: tmda-optionparser.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -30,7 +31,8 @@
%prep
%setup -q
-%patch -p1 -b .tofmipd-init
+%patch0 -p1 -b .tofmipd-init
+%patch1 -p1 -b .option-parser
%build
@@ -152,6 +154,9 @@
%changelog
+* Sat Feb 24 2007 Bernard Johnson <bjohnson at symetrix.com> 1.1.10-5
+- patch option parser to accept multiple -e options
+
* Mon Feb 19 2007 Bernard Johnson <bjohnson at symetrix.com> 1.1.10-4.2
- bump rel
More information about the scm-commits
mailing list