Hello community, here is the log from the commit of package dd_rhelp for openSUSE:Factory checked in at 2014-03-14 15:15:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dd_rhelp (Old) and /work/SRC/openSUSE:Factory/.dd_rhelp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dd_rhelp" Changes: -------- --- /work/SRC/openSUSE:Factory/dd_rhelp/dd_rhelp.changes 2013-02-04 19:30:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dd_rhelp.new/dd_rhelp.changes 2014-03-14 15:15:53.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Mar 8 19:05:19 CET 2014 - [email protected] + +- Update dd_rhelp_EOF.diff to support dd_rescue-1.41+. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dd_rhelp.spec ++++++ --- /var/tmp/diff_new_pack.QGz37O/_old 2014-03-14 15:15:54.000000000 +0100 +++ /var/tmp/diff_new_pack.QGz37O/_new 2014-03-14 15:15:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dd_rhelp # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 ++++++ dd_rhelp_EOF.diff ++++++ --- /var/tmp/diff_new_pack.QGz37O/_old 2014-03-14 15:15:54.000000000 +0100 +++ /var/tmp/diff_new_pack.QGz37O/_new 2014-03-14 15:15:54.000000000 +0100 @@ -2,12 +2,25 @@ =================================================================== --- dd_rhelp-0.3.0.orig/dd_rhelp +++ dd_rhelp-0.3.0/dd_rhelp -@@ -987,7 +987,7 @@ summary_first_line="$infoline \+ipos:.*, +@@ -986,9 +986,9 @@ infoline="^dd_rescue: (info):" + summary_first_line="$infoline \+ipos:.*, opos:.*, xferd:.*$" ## 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.*\$" ++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]\+\$" + +@@ -1082,9 +1082,9 @@ function get_eof() { + else + eoflines="$1" + fi + +- eoflines=$(echo "$eoflines" | "${grep}" "$eofstring" | sed_compat 's/^dd_rescue: \(info\): .* \(([0-9\.]+)k\): EOF.*$/\1/g') ++ eoflines=$(echo "$eoflines" | "${grep}" "$eofstring" | sed_compat 's/^dd_rescue: \(info\): .* \(([0-9\.]+)k[^\)]*\): EOF.*$/\1/g') + + for i in $eoflines; do + + ## XXXvlab: what the f*ck ? -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
