Author: glen Date: Fri Jun 18 09:23:32 2010 GMT Module: packages Tag: HEAD ---- Log message: - shadow outer var fix
---- Files affected: packages/cvsspam: cvsspam.spec (1.45 -> 1.46) , ruby19-shadow-outer-var.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/cvsspam/cvsspam.spec diff -u packages/cvsspam/cvsspam.spec:1.45 packages/cvsspam/cvsspam.spec:1.46 --- packages/cvsspam/cvsspam.spec:1.45 Wed Apr 7 17:28:38 2010 +++ packages/cvsspam/cvsspam.spec Fri Jun 18 11:23:26 2010 @@ -3,7 +3,7 @@ Summary(pl.UTF-8): CVSspam - wysyłanie różnic po wykonaniu zmiany w repozytorium CVS Name: cvsspam Version: 0.2.12 -Release: 13 +Release: 13.1 License: GPL Group: Applications/System Source0: http://www.badgers-in-foil.co.uk/projects/cvsspam/releases/%{name}-%{version}.tar.gz @@ -13,6 +13,7 @@ Patch0: %{name}-textdiff.patch Patch1: %{name}-tracfunc.patch Patch2: ruby19.patch +Patch3: ruby19-shadow-outer-var.patch URL: http://www.badgers-in-foil.co.uk/projects/cvsspam/ BuildRequires: rpmbuild(macros) >= 1.277 Requires: cvs-client @@ -43,6 +44,7 @@ %patch0 -p0 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %install rm -rf $RPM_BUILD_ROOT @@ -87,6 +89,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.46 2010/06/18 09:23:26 glen +- shadow outer var fix + Revision 1.45 2010/04/07 15:28:38 glen - ruby19 fix on users file encoding reading ================================================================ Index: packages/cvsspam/ruby19-shadow-outer-var.patch diff -u /dev/null packages/cvsspam/ruby19-shadow-outer-var.patch:1.1 --- /dev/null Fri Jun 18 11:23:32 2010 +++ packages/cvsspam/ruby19-shadow-outer-var.patch Fri Jun 18 11:23:26 2010 @@ -0,0 +1,52 @@ +fix warnings for "warning: shadowing outer local variable - line" +side effect is that code starts to work again. + +--- cvsspam-0.2.12/collect_diffs.rb 2010-06-18 12:15:54.514725990 +0300 ++++ cvsspam-0.2.12/collect_diffs.rb 2010-06-18 12:16:09.410605410 +0300 +@@ -169,8 +169,7 @@ + + raise "missing data dir (#{$tmpdir}/#{$dirtemplate}-XXXXXX)" if $datadir==nil + +- line = $stdin.gets +- unless line =~ /^Update of (.+)/ ++ unless $stdin.gets =~ /^Update of (.+)/ + fail "Log preamble looks suspect (doesn't start 'Update of ...')" + end + +@@ -189,11 +188,15 @@ + end + + # look for the start of the user's comment ++ got_log_message = false + $stdin.each do |line| +- break if line =~ /^Log Message/ ++ if line =~ /^Log Message/ ++ got_log_message = true ++ break ++ end + end + +- unless line =~ /^Log Message/ ++ unless got_log_message + fail "Input did not contain a 'Log Message:' entry" + end + +@@ -273,12 +276,14 @@ + blah("about to run #{diff_cmd.join(' ')}") + safer_popen(*diff_cmd) do |pipe| + # skip over cvs-diff's preamble +- pipe.each do |line| +- break if line =~ /^diff / ++ line = nil ++ pipe.each do |l| ++ line = l ++ break if l =~ /^diff / + end + file.puts "#U #{line}" +- pipe.each do |line| +- file.puts "#U #{line}" ++ pipe.each do |l| ++ file.puts "#U #{l}" + end + end + end ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cvsspam/cvsspam.spec?r1=1.45&r2=1.46&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
