7619eeb31a
* Handle directory as output filename (append input basename). - Fix dd_rhelp.test script and add to %check. OBS-URL: https://build.opensuse.org/package/show/Base:System/dd_rescue?expand=0&rev=5
23 lines
950 B
Diff
23 lines
950 B
Diff
Index: dd_rhelp-0.1.2/dd_rhelp
|
|
===================================================================
|
|
--- dd_rhelp-0.1.2.orig/dd_rhelp
|
|
+++ dd_rhelp-0.1.2/dd_rhelp
|
|
@@ -904,7 +904,7 @@ fi
|
|
|
|
# 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...
|
|
@@ -1472,7 +1472,7 @@ function process_log() {
|
|
|
|
[ "$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 "."
|