Hello community, here is the log from the commit of package dd_rhelp for openSUSE:Factory checked in at 2013-02-04 19:30:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dd_rhelp (Old) and /work/SRC/openSUSE:Factory/.dd_rhelp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dd_rhelp", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/dd_rhelp/dd_rhelp.changes 2012-05-08 11:14:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dd_rhelp.new/dd_rhelp.changes 2013-02-04 19:30:05.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Feb 3 22:00:46 CET 2013 - [email protected] + +- Apply three fixes: + * dd_rhelp_EOF.diff: Be tolerant to error messages after EOF. + * dd_rhelp_Summary.diff: Avoid misparsing Summary line. + * dd_rhelp.test.diff: Don't misparse dd_rescue version number. + +------------------------------------------------------------------- New: ---- dd_rhelp.test.diff dd_rhelp_EOF.diff dd_rhelp_Summary.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dd_rhelp.spec ++++++ --- /var/tmp/diff_new_pack.CGXTL3/_old 2013-02-04 19:30:06.000000000 +0100 +++ /var/tmp/diff_new_pack.CGXTL3/_new 2013-02-04 19:30:06.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dd_rhelp # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,9 @@ Group: System/Base Url: http://www.kalysto.org/utilities/dd_rhelp/index.en.html Source0: http://www.kalysto.org/pkg/%{name}-%{version}.tar.gz +Patch1: dd_rhelp_EOF.diff +Patch2: dd_rhelp_Summary.diff +Patch3: dd_rhelp.test.diff BuildRequires: bc BuildRequires: dd_rescue # dd_rhelp (version 0.1.2) was splitted from dd_rescue after openSUSE 12.1 (at dd_rescue version 1.25) @@ -41,6 +44,9 @@ %prep %setup -q +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build ++++++ dd_rhelp.test.diff ++++++ Index: dd_rhelp-0.3.0/dd_rhelp.test =================================================================== --- dd_rhelp-0.3.0.orig/dd_rhelp.test +++ dd_rhelp-0.3.0/dd_rhelp.test @@ -280,9 +280,9 @@ function assert_list () { # assert "$tprog --help sends errorlevel 0" $tprog --help # assert "$tprog --version sends errorlevel 0" $tprog --version # -# assert "$tprog --version sends version info" matches \"$($tprog --version)\" \"$tprog ver\. [0-9]\+\.[0-9]\+\.[0-9]\+\" +# assert "$tprog --version sends version info" matches \"$($tprog --version)\" \"$tprog ver\\. [0-9]\\+\\.[0-9]\\+\\.[0-9]\\+\" # -# assert "$tprog --help output contains info in first line" matches \"$($tprog --help | "$head" -n 1)\" \"$tprog ver\. [0-9]\+\.[0-9]\+\.[0-9]\+\" +# assert "$tprog --help output contains info in first line" matches \"$($tprog --help | "$head" -n 1)\" \"$tprog ver\\. [0-9]\\+\\.[0-9]\\+\\.[0-9]\\+\" # # assert "$tprog --help info are the same than $tprog --help" [ \"$($tprog --help | "$head" -n 1)\" == \"$($tprog --version)\" ] #} ++++++ dd_rhelp_EOF.diff ++++++ Index: dd_rhelp-0.3.0/dd_rhelp =================================================================== --- dd_rhelp-0.3.0.orig/dd_rhelp +++ dd_rhelp-0.3.0/dd_rhelp @@ -987,7 +987,7 @@ summary_first_line="$infoline \+ipos:.*, ## infoline has been added to Summary line in dd_rescue output recently (> 1.14, <= 1.25) string="\($infoline\)\? *Summary for [^:]\+ -> [^:]\+:\$" -eofstring="$infoline [^(]\+ ([0-9]\+\.[0-9]k): EOF\$" +eofstring="$infoline [^(]\+ ([0-9]\+\.[0-9]k): EOF.*\$" nb_stars=$[ $bar_lines * $COLUMNS ] # nb of char to display progress bar... badblockline_regexp="^Bad block: [0-9]\+\$" ++++++ dd_rhelp_Summary.diff ++++++ Index: dd_rhelp-0.3.0/dd_rhelp =================================================================== --- dd_rhelp-0.3.0.orig/dd_rhelp +++ dd_rhelp-0.3.0/dd_rhelp @@ -1746,7 +1746,7 @@ function process_log() { ## Remove first line of summaries that had 0.0k transfered. (They are useless) # XXXVaab : bad if file is less that 0.1Ko length - data=$(echo "$data" | "${grep}" -v "xferd: \+0.0k$") + data=$(echo "$data" | "${grep}" -v "xferd: \+0.0k$" | "${grep}" -v "$string") [ "$DEBUG" == "on" ] && echo -n "." -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
