Accepting request 80856 from Base:System
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
This commit is contained in:
Lars Vogdt
committed by
Git OBS Bridge
Git OBS Bridge
parent
2d01e7cd58
commit
1096efb663
@@ -1,3 +1,35 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Sep 3 20:31:45 UTC 2011 - asterios.dramis@gmail.com
|
||||
|
||||
- Spec file updates:
|
||||
* Changed License: to GPL-2.0 (bnc#714914).
|
||||
* Minor other updates.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat May 14 19:15:25 UTC 2011 - asterios.dramis@gmail.com
|
||||
|
||||
- Update to dd_rhelp-0.1.2:
|
||||
* IMPROVEMENT : will check the log file destination for sane conditions and
|
||||
will try some other locations if not.
|
||||
* IMPROVEMENT : will manage max_err parameter to avoid creating to much
|
||||
chunks.
|
||||
* More and better information displayed at 'info' time.
|
||||
From dd_rhelp-0.1.0:
|
||||
* INSTALL : No more ./configure && make && make install ... all detection
|
||||
were done at runtime anyway
|
||||
* UPDATE : updated libs provided in dd_rhelp
|
||||
* UPDATE : finally compatible with recent tail/head "-n" arguments
|
||||
* Added some sanity tests.
|
||||
* TEST : Started to create dd_rhelp.test which unit tests dd_rhelp.
|
||||
- Spec file updates:
|
||||
* Changes based on rpmdevtools templates and spec-cleaner run.
|
||||
* Added description for the patches based on openSUSE Patches Guidelines.
|
||||
* Added a fix inside the spec file to remove build time references
|
||||
* dd_rhelp no longer needs auto* tools.
|
||||
* Minor other updates.
|
||||
- Removed dd_rhelp_src.diff patch (fixed upstream).
|
||||
- Rebased the other patches to apply cleanly.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 2 23:55:27 CET 2010 - garloff@suse.de
|
||||
|
||||
|
||||
106
dd_rescue.spec
106
dd_rescue.spec
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package dd_rescue (Version 1.23_0.0.6)
|
||||
# spec file for package dd_rescue
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2011 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
|
||||
@@ -17,78 +17,72 @@
|
||||
|
||||
# norootforbuild
|
||||
|
||||
%define ddrescuever 1.23
|
||||
%define ddrhelpver 0.1.2
|
||||
|
||||
Name: dd_rescue
|
||||
%define ddrescuever 1.23
|
||||
%define ddrhelpver 0.0.6
|
||||
Version: 1.23_0.0.6
|
||||
Version: %{ddrescuever}_%{ddrhelpver}
|
||||
Release: 1
|
||||
License: GNU General Public License (GPL) v2 or v3
|
||||
Group: System/Base
|
||||
#Provides: ddrescue = 1.23
|
||||
#Obsoletes: ddrescue < 1.15
|
||||
AutoReqProv: on
|
||||
Requires: bc
|
||||
BuildRequires: libfallocate-devel-static
|
||||
Summary: Data Copying in the Presence of I/O Errors
|
||||
Source: http://www.garloff.de/kurt/linux/ddrescue/dd_rescue-%{ddrescuever}.tar.gz
|
||||
Source1: dd_rhelp-%{ddrhelpver}.tar.gz
|
||||
#Patch: dd_rescue-%{version}.diff
|
||||
Patch2: dd_rhelp_src.diff
|
||||
Patch3: ddresc-112.diff
|
||||
Patch4: dd_rhelp_EOF.diff
|
||||
Patch5: dd_rhelp_Summary.diff
|
||||
|
||||
License: GPL-2.0
|
||||
Url: http://www.garloff.de/kurt/linux/ddrescue/
|
||||
Group: System/Base
|
||||
Source0: http://www.garloff.de/kurt/linux/ddrescue/%{name}-%{ddrescuever}.tar.gz
|
||||
Source1: http://www.kalysto.org/pkg/dd_rhelp-%{ddrhelpver}.tar.gz
|
||||
# PATCH-FIX-OPENSUSE ddresc-112.diff garloff@suse.de -- Use -y0 if ddrescue is 1.12 or newer
|
||||
Patch0: ddresc-112.diff
|
||||
# PATCH-FIX-OPENSUSE dd_rhelp_EOF.diff garloff@suse.de -- Adjust dd_rhelp to changes in dd_rescue
|
||||
Patch1: dd_rhelp_EOF.diff
|
||||
# PATCH-FIX-OPENSUSE dd_rhelp_Summary.diff garloff@suse.de -- dd_rhelp adjusted for Summary change
|
||||
Patch2: dd_rhelp_Summary.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
BuildRequires: libfallocate-devel-static
|
||||
Requires: bc
|
||||
Provides: ddrescue = %{ddrescuever}
|
||||
Obsoletes: ddrescue < %{ddrescuever}
|
||||
|
||||
%description
|
||||
dd_rescue helps when nothing else can: your disk has crashed and you
|
||||
try to copy it over to another one. While standard Unix tools like cp,
|
||||
cat, and dd wail "abort" on every I/O error, dd_rescue does not.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Kurt Garloff <garloff@suse.de>
|
||||
|
||||
%prep
|
||||
%setup -n dd_rescue -b1
|
||||
#%patch -p1
|
||||
cd ../dd_rhelp-%{ddrhelpver}
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
for name in FAQ NEWS README THANKS TODO; do
|
||||
cp -p $name ${name}.dd_rhelp
|
||||
%setup -q -n dd_rescue -a1
|
||||
cd dd_rhelp-%{ddrhelpver}
|
||||
%patch0
|
||||
%patch1
|
||||
%patch2
|
||||
for name in AUTHORS COPYING ChangeLog FAQ NEWS README THANKS TODO; do
|
||||
cp -p $name ${name}.dd_rhelp
|
||||
done
|
||||
cd ..
|
||||
|
||||
# Remove build time references so build-compare can do its work
|
||||
FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M')
|
||||
FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
|
||||
sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/g" dd_rescue.c
|
||||
sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/g" dd_rescue.c
|
||||
|
||||
%build
|
||||
make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" libfalloc-static LIBDIR=%{_libdir}
|
||||
cd ../dd_rhelp-%{ddrhelpver}
|
||||
# Ubuntu needs this
|
||||
%if 0%{?xubuntu_version} != 0
|
||||
automake --add-missing
|
||||
%endif
|
||||
autoreconf
|
||||
./configure
|
||||
make
|
||||
make RPM_OPT_FLAGS="%{optflags}" libfalloc-static LIBDIR=%{_libdir} %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
make install DESTDIR=$RPM_BUILD_ROOT INSTASROOT= INSTALLFLAGS=
|
||||
cd ../dd_rhelp-%{ddrhelpver}
|
||||
make install DESTDIR=$RPM_BUILD_ROOT bindir=/bin
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
/bin/dd_rescue
|
||||
/bin/dd_rhelp
|
||||
%doc README.dd_rescue
|
||||
%doc ../dd_rhelp-%{ddrhelpver}/*.dd_rhelp
|
||||
%doc ../dd_rhelp-%{ddrhelpver}/doc
|
||||
make install DESTDIR=%{buildroot} INSTASROOT= INSTALLFLAGS=
|
||||
cd dd_rhelp-%{ddrhelpver}
|
||||
install -Dpm 0755 dd_rhelp %{buildroot}/bin
|
||||
cd ..
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
rm -rf $RPM_BUILD_DIR/dd_rescue
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc COPYING README.dd_rescue
|
||||
%doc dd_rhelp-%{ddrhelpver}/*.dd_rhelp
|
||||
%doc dd_rhelp-%{ddrhelpver}/doc
|
||||
/bin/dd_rescue
|
||||
/bin/dd_rhelp
|
||||
|
||||
%changelog
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5c3f88a37c163d46ebeda054215c4f407857c5a99a9a962646c5d894c07c89fe
|
||||
size 67098
|
||||
3
dd_rhelp-0.1.2.tar.gz
Normal file
3
dd_rhelp-0.1.2.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7b4fba7b76c937b532afec52eeb47c749bd3482a6e01058b54f1f9f0a89b1f3a
|
||||
size 34614
|
||||
@@ -1,9 +1,6 @@
|
||||
Index: dd_rhelp-0.0.6/src/dd_rhelp-sh
|
||||
===================================================================
|
||||
--- dd_rhelp-0.0.6.orig/src/dd_rhelp-sh
|
||||
+++ dd_rhelp-0.0.6/src/dd_rhelp-sh
|
||||
@@ -191,9 +191,9 @@ fi
|
||||
# regexp for parsing the log file.
|
||||
--- dd_rhelp.orig 2011-05-14 20:17:10.782000079 +0300
|
||||
+++ dd_rhelp 2011-05-14 20:18:26.578000081 +0300
|
||||
@@ -906,7 +906,7 @@
|
||||
|
||||
string="^Summary for $infile -> $outfile:"
|
||||
infoline="^dd_rescue: (info):"
|
||||
@@ -12,15 +9,12 @@ Index: dd_rhelp-0.0.6/src/dd_rhelp-sh
|
||||
nb_stars=$[ $bar_lines * $COLUMNS ] # nb of char to display progress bar...
|
||||
|
||||
#
|
||||
# === Functions
|
||||
@@ -314,9 +314,9 @@ function bc_calc ()
|
||||
# or 'nb' where nb is best EOF found
|
||||
@@ -990,7 +990,7 @@
|
||||
function get_eof()
|
||||
{
|
||||
|
||||
- eoflines="$("${CAT}" "$logfile" | "$tr" -d "\\r" | "$GREP" "$eofstring" | "$SED" 's/^dd_rescue: (info): .* (\([0-9\.]\+\)k): EOF$/\1/g')"
|
||||
+ eoflines="$("${CAT}" "$logfile" | "$tr" -d "\\r" | "$GREP" "$eofstring" | "$SED" 's/^dd_rescue: (info): .* (\([0-9\.]\+\)k): EOF.*$/\1/g')"
|
||||
- eoflines="$("${cat}" "$logfile" | "${tr}" -d "\\r" | "${grep}" "$eofstring" | "${sed}" 's/^dd_rescue: (info): .* (\([0-9\.]\+\)k): EOF$/\1/g')"
|
||||
+ eoflines="$("${cat}" "$logfile" | "${tr}" -d "\\r" | "${grep}" "$eofstring" | "${sed}" 's/^dd_rescue: (info): .* (\([0-9\.]\+\)k): EOF.*$/\1/g')"
|
||||
|
||||
eof="nothing"
|
||||
|
||||
for i in $eoflines
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
Index: dd_rhelp-0.0.6/src/dd_rhelp-sh
|
||||
===================================================================
|
||||
--- dd_rhelp-0.0.6.orig/src/dd_rhelp-sh
|
||||
+++ dd_rhelp-0.0.6/src/dd_rhelp-sh
|
||||
@@ -190,7 +190,7 @@ fi
|
||||
--- 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.
|
||||
|
||||
@@ -11,12 +9,12 @@ Index: dd_rhelp-0.0.6/src/dd_rhelp-sh
|
||||
infoline="^dd_rescue: (info):"
|
||||
eofstring="$infoline .* ([0-9]\+\.[0-9]k): EOF.*\$"
|
||||
nb_stars=$[ $bar_lines * $COLUMNS ] # nb of char to display progress bar...
|
||||
@@ -753,7 +753,7 @@ function process_log()
|
||||
test -z data && return 0
|
||||
@@ -1471,7 +1471,7 @@
|
||||
|
||||
[ "$DEBUG" == "on" ] && echo -n "- cleaning data ["
|
||||
- data=$(echo "$data" | "$GREP" -v "xferd: \+0.0k$")
|
||||
+ data=$(echo "$data" | "$GREP" -v "xferd: \+0.0k$" | "$GREP" -v "$string")
|
||||
# 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-)
|
||||
data=$(echo "$data" | "${grep}" "$infoline" -A 1 | "${cut}" -c 12-)
|
||||
[ "$DEBUG" == "on" ] && echo -n "."
|
||||
|
||||
@@ -1,157 +0,0 @@
|
||||
Index: dd_rhelp-0.0.6/src/dd_rhelp-sh
|
||||
===================================================================
|
||||
--- dd_rhelp-0.0.6.orig/src/dd_rhelp-sh
|
||||
+++ dd_rhelp-0.0.6/src/dd_rhelp-sh
|
||||
@@ -225,9 +225,9 @@ function get_valid_dd_rescue
|
||||
else
|
||||
[ "$DEBUG" == "on" ] && echo "BAD !" >&2
|
||||
fi
|
||||
|
||||
- path="$(dirname $(type -ap "$0" | "${TAIL}" -1))/dd_rescue"
|
||||
+ path="$(dirname $(type -ap "$0" | "${TAIL}" -n 1))/dd_rescue"
|
||||
|
||||
if [ -x "$path" ] ;then
|
||||
version=$("$path" -V 2>&1 | grep "dd_rescue Version" | cut -f 3 -d " " |
|
||||
cut -f 1 -d ",")
|
||||
@@ -356,9 +356,9 @@ function add_chunk()
|
||||
while test "$parsechunk"
|
||||
do
|
||||
|
||||
# get first chunk already marked.
|
||||
- i="$(echo "$parsechunk" | "${HEAD}" -1 )"
|
||||
+ i="$(echo "$parsechunk" | "${HEAD}" -n 1 )"
|
||||
|
||||
# pull the two bounds
|
||||
i_start="$(echo "$i" | "${CUT}" -f 1 -d "-")"
|
||||
i_stop="$(echo "$i" | "${CUT}" -f 2 -d "-")"
|
||||
@@ -371,9 +371,9 @@ function add_chunk()
|
||||
then
|
||||
# new chunk doesn't overlap with current chunk
|
||||
# Iterate, put current chunk in $goodchunk.
|
||||
goodchunk="$(echo -en "$goodchunk\n$i")"
|
||||
- parsechunk="$(echo "$parsechunk" | "${TAIL}" +2)"
|
||||
+ parsechunk="$(echo "$parsechunk" | "${TAIL}" -n +2)"
|
||||
continue
|
||||
fi
|
||||
|
||||
# new chunk ends before current chunk start ?
|
||||
@@ -407,18 +407,18 @@ function add_chunk()
|
||||
# new chunk contains entirely current chunk
|
||||
if [ "$as_int" == "0" ] && [ "$ae_int" == "0" ]
|
||||
then
|
||||
# we forget about current chunk, and iterate.
|
||||
- parsechunk=$(echo "$parsechunk" | "${TAIL}" +2)
|
||||
+ parsechunk=$(echo "$parsechunk" | "${TAIL}" -n +2)
|
||||
continue
|
||||
fi
|
||||
|
||||
# new chunk overlap on its end with beginning of current chunk
|
||||
if [ "$as_int" == "0" ] && [ "$ae_int" == "1" ]
|
||||
then
|
||||
# grow new chunk to englobe current chunk.
|
||||
arg_stop=$i_stop
|
||||
- parsechunk=$(echo "$parsechunk" | "${TAIL}" +2)
|
||||
+ parsechunk=$(echo "$parsechunk" | "${TAIL}" -n +2)
|
||||
|
||||
break; # we can break because chunk are sorted.
|
||||
fi
|
||||
|
||||
@@ -426,9 +426,9 @@ function add_chunk()
|
||||
if [ "$as_int" == "1" ] && [ "$ae_int" == "0" ]
|
||||
then
|
||||
# grow new chunk to englobe current chunk.
|
||||
arg_start=$i_start
|
||||
- parsechunk=$(echo "$parsechunk" | "${TAIL}" +2)
|
||||
+ parsechunk=$(echo "$parsechunk" | "${TAIL}" -n +2)
|
||||
continue; # new chunk might overlap more chunks
|
||||
fi
|
||||
|
||||
done
|
||||
@@ -455,9 +455,9 @@ function get_next_pos()
|
||||
|
||||
# finding last's chunk end.
|
||||
|
||||
if test "$chunk" ;then
|
||||
- last_chunk=$(echo "$chunk" | "${TAIL}" -1 )
|
||||
+ last_chunk=$(echo "$chunk" | "${TAIL}" -n 1 )
|
||||
max_stop=$(echo "$last_chunk" | "${CUT}" -f 2 -d "-")
|
||||
else
|
||||
max_stop=0
|
||||
fi
|
||||
@@ -504,9 +504,9 @@ function get_next_pos()
|
||||
# changes $logcontent, $chunk, $eof
|
||||
function swallow_last_summary()
|
||||
{
|
||||
# last summary of log (4 lines output by printreport())
|
||||
- last_logcontent=$("${CAT}" "$logfile" | "$tr" -d "\\r" | "$GREP" "$string" -A 3 | "${TAIL}" -4)
|
||||
+ last_logcontent=$("${CAT}" "$logfile" | "$tr" -d "\\r" | "$GREP" "$string" -A 3 | "${TAIL}" -n 4)
|
||||
process_log "$last_logcontent"
|
||||
|
||||
get_eof
|
||||
|
||||
@@ -518,9 +518,9 @@ function swallow_last_summary()
|
||||
|
||||
function get_last_chunk()
|
||||
{
|
||||
if test "$chunk"; then
|
||||
- last_chunk="$(echo "$chunk" | "${TAIL}" -1 )"
|
||||
+ last_chunk="$(echo "$chunk" | "${TAIL}" -n 1 )"
|
||||
echo "$last_chunk" | "${CUT}" -f 2 -d "-"
|
||||
else
|
||||
echo 0
|
||||
fi
|
||||
@@ -684,10 +684,10 @@ function show_info()
|
||||
total_xferd="0";
|
||||
|
||||
while test "$parsing"
|
||||
do
|
||||
- firstline="$(echo "$parsing" | "${HEAD}" -1)"
|
||||
- parsing="$(echo "$parsing" | "${TAIL}" +2)"
|
||||
+ firstline="$(echo "$parsing" | "${HEAD}" -n 1)"
|
||||
+ parsing="$(echo "$parsing" | "${TAIL}" -n +2)"
|
||||
|
||||
xferd="$(echo "$firstline" | "${CUT}" -f 2 -d ":" | "${CUT}" -f 2 -d "=")"
|
||||
errxfer="$(echo "$firstline" | "${CUT}" -f 4 -d ":" | "${CUT}" -f 2 -d "=")"
|
||||
succxfer="$(echo "$firstline" | "${CUT}" -f 5 -d ":" | "${CUT}" -f 2 -d "=")"
|
||||
@@ -776,10 +776,10 @@ function process_log()
|
||||
parsing="$data"
|
||||
# chunk=""
|
||||
|
||||
while test "$parsing" ;do
|
||||
- firstline="$(echo "$parsing" | "${HEAD}" -1)"
|
||||
- parsing="$(echo "$parsing" | "${TAIL}" +2)"
|
||||
+ firstline="$(echo "$parsing" | "${HEAD}" -n 1)"
|
||||
+ parsing="$(echo "$parsing" | "${TAIL}" -n +2)"
|
||||
|
||||
ipos="$(echo $firstline | "${CUT}" -f 1 -d ":" | "${CUT}" -f 2 -d "=")"
|
||||
xferd="$(echo $firstline | "${CUT}" -f 2 -d ":" | "${CUT}" -f 2 -d "=")"
|
||||
rev="$(echo $firstline | "${CUT}" -f 3 -d ":")"
|
||||
@@ -814,21 +814,21 @@ function load_log()
|
||||
#
|
||||
# loading into memory Summary info found in log file...
|
||||
#
|
||||
# line number of last save_log entry...
|
||||
- lnb_save=$("${CAT}" -n "$logfile" | "$tr" -d "\\r" | grep "chunk:" -A 2 | "${TAIL}" -3)
|
||||
+ lnb_save=$("${CAT}" -n "$logfile" | "$tr" -d "\\r" | grep "chunk:" -A 2 | "${TAIL}" -n 3)
|
||||
|
||||
|
||||
if test "$lnb_save" ;then
|
||||
- lnb_save=$(echo $lnb_save | "${HEAD}" -1 | cut -f 1 -d " ")
|
||||
+ lnb_save=$(echo $lnb_save | "${HEAD}" -n 1 | cut -f 1 -d " ")
|
||||
|
||||
- end_log="$(cat "$logfile" | "$tr" -d "\\r" | "${TAIL}" "+$lnb_save")"
|
||||
+ end_log="$(cat "$logfile" | "$tr" -d "\\r" | "${TAIL}" -n "+$lnb_save")"
|
||||
|
||||
- last_lines=$(echo "$end_log" | grep "chunk:" -A 2 | "${TAIL}" -3)
|
||||
+ last_lines=$(echo "$end_log" | grep "chunk:" -A 2 | "${TAIL}" -n 3)
|
||||
|
||||
- log=$(echo "$last_lines" | "$GREP" "chunk" | "${TAIL}" -1 )
|
||||
- log1=$(echo "$last_lines" | "$GREP" "logcontent" | "${TAIL}" -1 )
|
||||
- log2=$(echo "$last_lines" | "$GREP" "eof" | "${TAIL}" -1 )
|
||||
+ log=$(echo "$last_lines" | "$GREP" "chunk" | "${TAIL}" -n 1 )
|
||||
+ log1=$(echo "$last_lines" | "$GREP" "logcontent" | "${TAIL}" -n 1 )
|
||||
+ log2=$(echo "$last_lines" | "$GREP" "eof" | "${TAIL}" -n 1 )
|
||||
|
||||
if test "$log" && test "$log1" && test "$log2" ;then
|
||||
chunk="$(echo "$log" | "${CUT}" -f 2- -d ":" | "${TR}" ":" "\n")"
|
||||
|
||||
@@ -1,20 +1,15 @@
|
||||
Index: dd_rhelp-0.0.6/src/dd_rhelp-sh
|
||||
===================================================================
|
||||
--- dd_rhelp-0.0.6.orig/src/dd_rhelp-sh
|
||||
+++ dd_rhelp-0.0.6/src/dd_rhelp-sh
|
||||
@@ -219,9 +219,14 @@ function get_valid_dd_rescue
|
||||
--- dd_rhelp.orig 2009-04-22 00:49:27.000000000 +0300
|
||||
+++ dd_rhelp 2011-05-14 20:14:08.592000080 +0300
|
||||
@@ -945,7 +945,11 @@
|
||||
|
||||
if is_num "$version" && [ "$(bc_calc 2 "$version < 1.03")" == "0" ]
|
||||
then
|
||||
if is_num "$version" && [ "$(bc_calc 2 "$version < 1.03")" == "0" ]; then
|
||||
[ "$DEBUG" == "on" ] && echo "OK !" >&2
|
||||
- echo "$path"
|
||||
+ if [ "$(bc_calc 2 "$version < 1.12")" == "0" ]
|
||||
+ then
|
||||
+ echo "$path -y0"
|
||||
+ else
|
||||
+ echo "$path"
|
||||
+ fi
|
||||
return 0
|
||||
- echo "$path"
|
||||
+ if [ "$(bc_calc 2 "$version < 1.12")" == "0" ];then
|
||||
+ echo "$path -y0"
|
||||
+ else
|
||||
+ echo "$path"
|
||||
+ fi
|
||||
return 0
|
||||
else
|
||||
[ "$DEBUG" == "on" ] && echo "BAD !" >&2
|
||||
fi
|
||||
[ "$DEBUG" == "on" ] && echo "BAD !" >&2
|
||||
|
||||
Reference in New Issue
Block a user