commit dd_rhelp for openSUSE:Factory
Hello community,
here is the log from the commit of package dd_rhelp for openSUSE:Factory
checked in at 2018-03-16 10:42:24
Comparing /work/SRC/openSUSE:Factory/dd_rhelp (Old)
and /work/SRC/openSUSE:Factory/.dd_rhelp.new (New)
Package is "dd_rhelp"
Fri Mar 16 10:42:24 2018 rev:9 rq:586982 version:0.3.0
Changes:
--- /work/SRC/openSUSE:Factory/dd_rhelp/dd_rhelp.changes2014-03-14
15:15:53.0 +0100
+++ /work/SRC/openSUSE:Factory/.dd_rhelp.new/dd_rhelp.changes 2018-03-16
10:43:34.127998577 +0100
@@ -1,0 +2,5 @@
+Wed Mar 14 14:05:31 CET 2018 - k...@garloff.de
+
+- dd_r_version.diff: Make dd_rhelp accept version 1.99.x.
+
+---
New:
dd_r_version.diff
Other differences:
--
++ dd_rhelp.spec ++
--- /var/tmp/diff_new_pack.u0Ug7q/_old 2018-03-16 10:43:35.951932902 +0100
+++ /var/tmp/diff_new_pack.u0Ug7q/_new 2018-03-16 10:43:35.955932758 +0100
@@ -1,7 +1,7 @@
#
# spec file for package dd_rhelp
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,13 +20,14 @@
Version:0.3.0
Release:0
Summary:Bash Helper Script That Handles dd_rescue
-License:GPL-2.0+
+License:GPL-2.0-or-later
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
+Patch4: dd_r_version.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)
@@ -47,6 +48,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
++ dd_r_version.diff ++
Index: dd_rhelp-0.3.0/dd_rhelp
===
--- dd_rhelp-0.3.0.orig/dd_rhelp
+++ dd_rhelp-0.3.0/dd_rhelp
@@ -1039,8 +1039,9 @@ function get_valid_dd_rescue() {
# fi
version=$("$path" -V 2>&1 | "${grep}" "dd_rescue Version" | "$cut" -f 3 -d
" " | "$cut" -f 1 -d ",")
+version=$(echo "$version" | "$sed" 's/\([0-9]*\)\.\([0-9]*\).*/\1.\2/')
## Could get something as version info ?
if test -z "$version" || ! is_num "$version" ; then
commit dd_rhelp for openSUSE:Factory
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.changes2013-02-04
19:30:05.0 +0100
+++ /work/SRC/openSUSE:Factory/.dd_rhelp.new/dd_rhelp.changes 2014-03-14
15:15:53.0 +0100
@@ -1,0 +2,5 @@
+Sat Mar 8 19:05:19 CET 2014 - k...@garloff.de
+
+- 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.0 +0100
+++ /var/tmp/diff_new_pack.QGz37O/_new 2014-03-14 15:15:54.0 +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.0 +0100
+++ /var/tmp/diff_new_pack.QGz37O/_new 2014-03-14 15:15:54.0 +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: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit dd_rhelp for openSUSE:Factory
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.changes2012-05-08
11:14:29.0 +0200
+++ /work/SRC/openSUSE:Factory/.dd_rhelp.new/dd_rhelp.changes 2013-02-04
19:30:05.0 +0100
@@ -1,0 +2,8 @@
+Sun Feb 3 22:00:46 CET 2013 - k...@garloff.de
+
+- 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.0 +0100
+++ /var/tmp/diff_new_pack.CGXTL3/_new 2013-02-04 19:30:06.0 +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 infomatches \$($tprog
--version)\ \$tprog ver\. [0-9]\+\.[0-9]\+\.[0-9]\+\
+#assert $tprog --version sends version infomatches \$($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: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
