1096efb663
Update to dd_rhelp-0.1.2, Spec file updates, Removed dd_rhelp_src.diff patch (fixed upstream), Rebased the other patches to apply cleanly --- Also fixed bnc#714914 (from sr#80139) OBS-URL: https://build.opensuse.org/request/show/80856 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dd_rescue?expand=0&rev=4
21 lines
865 B
Diff
21 lines
865 B
Diff
--- dd_rhelp.orig 2011-05-14 20:18:26.578000081 +0300
|
|
+++ dd_rhelp 2011-05-14 20:20:47.411000081 +0300
|
|
@@ -904,7 +904,7 @@
|
|
|
|
# regexp for parsing the log file.
|
|
|
|
-string="^Summary for $infile -> $outfile:"
|
|
+string="^dd_rescue: (info): Summary for $infile -> $outfile:"
|
|
infoline="^dd_rescue: (info):"
|
|
eofstring="$infoline .* ([0-9]\+\.[0-9]k): EOF.*\$"
|
|
nb_stars=$[ $bar_lines * $COLUMNS ] # nb of char to display progress bar...
|
|
@@ -1471,7 +1471,7 @@
|
|
|
|
[ "$DEBUG" == "on" ] && echo -n "- cleaning data ["
|
|
# 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 "."
|
|
data=$(echo "$data" | "${grep}" "$infoline" -A 1 | "${cut}" -c 12-)
|
|
[ "$DEBUG" == "on" ] && echo -n "."
|