Hello community,

here is the log from the commit of package yast2-drbd for openSUSE:Factory 
checked in at 2015-08-13 18:10:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-drbd (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-drbd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-drbd"

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-drbd/yast2-drbd.changes    2015-08-11 
08:26:45.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-drbd.new/yast2-drbd.changes       
2015-08-13 18:11:08.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Aug 13 08:48:31 UTC 2015 - [email protected]
+
+- BSC#941567. Fix error message pop up when no res conf in
+  fisrt launch.
+- Version 3.1.15
+
+-------------------------------------------------------------------

Old:
----
  yast2-drbd-3.1.14.tar.bz2

New:
----
  yast2-drbd-3.1.15.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-drbd.spec ++++++
--- /var/tmp/diff_new_pack.wjdz8K/_old  2015-08-13 18:11:09.000000000 +0200
+++ /var/tmp/diff_new_pack.wjdz8K/_new  2015-08-13 18:11:09.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-drbd
-Version:        3.1.14
+Version:        3.1.15
 Release:        0
 
 %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services

++++++ yast2-drbd-3.1.14.tar.bz2 -> yast2-drbd-3.1.15.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-drbd-3.1.14/package/yast2-drbd.changes 
new/yast2-drbd-3.1.15/package/yast2-drbd.changes
--- old/yast2-drbd-3.1.14/package/yast2-drbd.changes    2015-08-10 
11:26:08.000000000 +0200
+++ new/yast2-drbd-3.1.15/package/yast2-drbd.changes    2015-08-13 
10:56:11.000000000 +0200
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Thu Aug 13 08:48:31 UTC 2015 - [email protected]
+
+- BSC#941567. Fix error message pop up when no res conf in
+  fisrt launch.
+- Version 3.1.15
+
+-------------------------------------------------------------------
 Mon Aug 10 09:23:32 UTC 2015 - [email protected]
 
 - BSC#941094. Change from /usr/sbin/drbd* to /sbin/drbd*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-drbd-3.1.14/package/yast2-drbd.spec 
new/yast2-drbd-3.1.15/package/yast2-drbd.spec
--- old/yast2-drbd-3.1.14/package/yast2-drbd.spec       2015-08-10 
11:26:08.000000000 +0200
+++ new/yast2-drbd-3.1.15/package/yast2-drbd.spec       2015-08-13 
10:56:11.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-drbd
-Version:        3.1.14
+Version:        3.1.15
 Release:        0
 
 %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-drbd-3.1.14/src/modules/Drbd.rb 
new/yast2-drbd-3.1.15/src/modules/Drbd.rb
--- old/yast2-drbd-3.1.14/src/modules/Drbd.rb   2015-08-10 11:26:08.000000000 
+0200
+++ new/yast2-drbd-3.1.15/src/modules/Drbd.rb   2015-08-13 10:56:11.000000000 
+0200
@@ -84,7 +84,8 @@
           "\t\tcat drbd.conf | while read line; do\n" +
           "\t\t\ts=`echo $line | awk '{print $1}'`;\n" +
           "\t\t\tif [[ x$s =~ xinclude ]]; then\n" +
-          "\t\t\t\tcat `echo $line | sed 's/include//' | sed 's/;//g' | sed 
's/\"//g'`;\n" +
+          "\t\t\t\tFNAME=`echo $line | sed 's/include//; s/;//g; s/\"//g'`;\n" 
+
+          "\t\t\t\tls $FNAME >/dev/null 2>&1 && cat $FNAME;\n " +
           "\t\t\telse\n" +
           "\t\t\t\techo $line;\n" +
           "\t\t\tfi\n" +


Reply via email to