Author: glen Date: Sun Jan 9 19:14:09 2011 GMT Module: packages Tag: HEAD ---- Log message: - fix arguments count to versionToString; rel 2
---- Files affected: packages/rpmlint: rpmlint.spec (1.29 -> 1.30) , versionToString-args.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/rpmlint/rpmlint.spec diff -u packages/rpmlint/rpmlint.spec:1.29 packages/rpmlint/rpmlint.spec:1.30 --- packages/rpmlint/rpmlint.spec:1.29 Sun Jan 9 18:48:54 2011 +++ packages/rpmlint/rpmlint.spec Sun Jan 9 20:14:03 2011 @@ -2,7 +2,7 @@ Summary: Tool for checking common errors in RPM packages Name: rpmlint Version: 1.0 -Release: 1 +Release: 2 License: GPL v2 Group: Development/Building Source0: http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2 @@ -12,6 +12,7 @@ Patch2: %{name}-licenses.patch Patch3: rpm-compat.patch Patch4: pythonpath.patch +Patch5: versionToString-args.patch URL: http://rpmlint.zarb.org/ BuildRequires: python >= 1.5.2 Requires: /bin/bash @@ -56,6 +57,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 cat <<'EOF' > rpmlint #!/bin/sh @@ -112,6 +114,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.30 2011/01/09 19:14:03 glen +- fix arguments count to versionToString; rel 2 + Revision 1.29 2011/01/09 17:48:54 glen - relocate code to python dir - works so rel 1 ================================================================ Index: packages/rpmlint/versionToString-args.patch diff -u /dev/null packages/rpmlint/versionToString-args.patch:1.1 --- /dev/null Sun Jan 9 20:14:09 2011 +++ packages/rpmlint/versionToString-args.patch Sun Jan 9 20:14:03 2011 @@ -0,0 +1,20 @@ +Traceback (most recent call last): + File "/usr/share/python2.7/site-packages/rpmlint/rpmlint.py", line 364, in <module> + File "/usr/share/python2.7/site-packages/rpmlint/rpmlint.py", line 159, in main + File "/usr/share/python2.7/site-packages/rpmlint/rpmlint.py", line 219, in runChecks + File "TagsCheck.py", line 650, in check +TypeError: versionToString() takes exactly 1 argument (3 given) + +--- rpmlint-1.0/TagsCheck.py~ 2011-01-09 19:47:00.271159953 +0200 ++++ rpmlint-1.0/TagsCheck.py 2011-01-09 20:56:11.377943725 +0200 +@@ -646,8 +646,8 @@ + printWarning(pkg, + 'incoherent-version-dependency-on', + base_or_libs, +- Pkg.versionToString(dep[2][0], +- dep[2][1], None), ++ Pkg.versionToString((dep[2][0], ++ dep[2][1], None)), + sexp) + res = devel_number_regex.search(name) + if not res: ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpmlint/rpmlint.spec?r1=1.29&r2=1.30&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
