Mailinglist Archive: opensuse-commit (1003 mails)

< Previous Next >
commit yast2-installation
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Sun, 03 Jun 2007 21:44:02 +0200
  • Message-id: <20070603194403.1F0CD678186@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-installation
checked in at Sun Jun 3 21:44:02 CEST 2007.

--------
--- yast2-installation/yast2-installation.changes       2007-05-30 11:35:30.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes  2007-06-01 12:42:29.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Jun  1 12:41:10 CEST 2007 - mzugec@xxxxxxx
+
+- use shared isNetworkRunning() function in network_finish
+- 2.15.28 
+
+-------------------------------------------------------------------

Old:
----
  yast2-installation-2.15.27.tar.bz2

New:
----
  yast2-installation-2.15.28.tar.bz2

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

Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.ba2601/_old  2007-06-03 21:43:43.000000000 +0200
+++ /var/tmp/diff_new_pack.ba2601/_new  2007-06-03 21:43:43.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-installation (Version 2.15.27)
+# spec file for package yast2-installation (Version 2.15.28)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,15 +11,15 @@
 # norootforbuild
 
 Name:           yast2-installation
-Version:        2.15.27
+Version:        2.15.28
 Release:        1
 License:        GNU General Public License (GPL)
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-installation-2.15.27.tar.bz2
+Source0:        yast2-installation-2.15.28.tar.bz2
 prefix:                /usr
 BuildRequires:  docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-country yast2-devtools yast2-testsuite
-BuildRequires:  yast2 >= 2.15.22
+BuildRequires:  yast2 >= 2.15.35
 Requires:       autoyast2-installation
 # WorkflowManager module, Installation::reboot_net_settings
 Requires:       yast2 >= 2.15.25
@@ -41,7 +41,8 @@
 # pkg-bindings are not directly required
 Conflicts:      yast2-pkg-bindings < 2.13.101
 # 'Product' and 'Installation' moved to 'yast2'
-Conflicts:      yast2 < 2.15.18
+# needs NetworkService::isNetworkRunning() from yast2
+Conflicts:      yast2 < 2.15.35
 # tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103)
 Requires:       tar gzip
 # for the first/second stage of installation
@@ -83,7 +84,7 @@
     Lukas Ocilka <locilka@xxxxxxx>
 
 %prep
-%setup -n yast2-installation-2.15.27
+%setup -n yast2-installation-2.15.28
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -146,6 +147,9 @@
 %endif
 
 %changelog
+* Fri Jun 01 2007 - mzugec@xxxxxxx
+- use shared isNetworkRunning() function in network_finish
+- 2.15.28
 * Wed May 30 2007 - mzugec@xxxxxxx
 - fixed spec requirements
 * Mon May 28 2007 - mzugec@xxxxxxx

++++++ yast2-installation-2.15.27.tar.bz2 -> yast2-installation-2.15.28.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.27/src/clients/network_finish.ycp new/yast2-installation-2.15.28/src/clients/network_finish.ycp
--- old/yast2-installation-2.15.27/src/clients/network_finish.ycp       2007-05-28 10:16:02.000000000 +0200
+++ new/yast2-installation-2.15.28/src/clients/network_finish.ycp       2007-06-01 12:42:06.000000000 +0200
@@ -8,7 +8,7 @@
  * Authors:
  *  Jiri Srain <jsrain@xxxxxxx>
  *
- * $Id: network_finish.ycp 38153 2007-05-28 08:16:01Z mzugec $
+ * $Id: network_finish.ycp 38240 2007-06-01 10:42:06Z mzugec $
  *
  */
 
@@ -21,6 +21,7 @@
 import "Arch";
 import "Linuxrc";
 import "String";
+import "NetworkService";
 
 any ret = nil;
 string func = "";
@@ -50,9 +51,7 @@
 {
 
  // if network running, write network configuration
- map output = (map)SCR::Execute(.target.bash_output,
-                "([ $(ip addr|grep -v '127.0.0.1'|grep -c inet) != '0' ] && echo 'network') || echo 'no net'");
- if (issubstring(output["stdout"]:"", "network"))
+ if (NetworkService::isNetworkRunning())
     {
        y2milestone("Save network configuration");
      WFM::CallFunction ("save_network");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.15.27/VERSION new/yast2-installation-2.15.28/VERSION
--- old/yast2-installation-2.15.27/VERSION      2007-05-27 14:49:35.000000000 +0200
+++ new/yast2-installation-2.15.28/VERSION      2007-06-01 12:40:26.000000000 +0200
@@ -1 +1 @@
-2.15.27
+2.15.28


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



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread