Hello community,

here is the log from the commit of package yast2 for openSUSE:Factory checked 
in at 2014-09-03 18:21:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2 (Old)
 and      /work/SRC/openSUSE:Factory/.yast2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2"

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2/yast2.changes      2014-08-30 
16:04:16.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2014-09-03 
21:23:09.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Aug 28 11:17:16 UTC 2014 - jreidin...@suse.com
+
+- fix using changed root in netd agent so it can be used in
+  installation (bnc#893965)
+- 3.1.103
+
+-------------------------------------------------------------------

Old:
----
  yast2-3.1.102.tar.bz2

New:
----
  yast2-3.1.103.tar.bz2

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

Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.3aQZai/_old  2014-09-03 21:23:10.000000000 +0200
+++ /var/tmp/diff_new_pack.3aQZai/_new  2014-09-03 21:23:10.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        3.1.102
+Version:        3.1.103
 Release:        0
 Url:            https://github.com/yast/yast-yast2
 

++++++ yast2-3.1.102.tar.bz2 -> yast2-3.1.103.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-3.1.102/library/general/src/servers_non_y2/ag_netd 
new/yast2-3.1.103/library/general/src/servers_non_y2/ag_netd
--- old/yast2-3.1.102/library/general/src/servers_non_y2/ag_netd        
2014-08-27 14:27:18.000000000 +0200
+++ new/yast2-3.1.103/library/general/src/servers_non_y2/ag_netd        
2014-09-01 14:52:08.000000000 +0200
@@ -7,6 +7,8 @@
 use ycp;
 use strict;
 use File::Basename;
+use File::Spec;
+
 
 my $debug = defined ($ARGV[0]) && $ARGV[0] =~ "^-.*d";
 
@@ -19,8 +21,9 @@
 # Testsuite hack:
 # Automake invokes dejagnu with an absolute srcdir :(
 # This will replace the current directory in file names by "./"
-# Turn it off by -n
-my $strip = ! (defined ($ARGV[0]) && $ARGV[0] =~ "^-.*n");
+# Turn it on only in old testsuite
+# TODO remove all this stuff when we drop old testsuite in yast2-inetd
+my $strip = defined($ENV{'Y2ALLGLOBAL'}) && ($ENV{'Y2ALLGLOBAL'} eq "1");
 my $pwd;
 if ($strip)
 {
@@ -478,12 +481,14 @@
            {
                if (/^\s*include\s+(\S+)/)
                {
-                   $class->parse_file ($1);
+                    my $ipath = $strip ? $1 : 
File::Spec->canonpath(File::Spec->catfile($main::root, $1));
+                   $class->parse_file ($ipath);
                    $reclineno = 0;
                }
                elsif (/^\s*includedir\s+(\S+)/)
                {
-                   $class->include_dir ($1);
+                    my $ipath = $strip ? $1 : 
File::Spec->canonpath(File::Spec->catfile($main::root, $1));
+                   $class->include_dir ($ipath);
                    # Bug 24270:
                    # the include directive must not belong
                    # to the following service
@@ -675,6 +680,7 @@
 my $netd;
 # if reading fails, defaulting to no services
 @services = ();
+our $root = "/";
 
 while ( <STDIN> )
 {
@@ -687,6 +693,17 @@
     }
 
     my ($command, @arguments) = ycp::ParseTerm ($_);
+    if ($command eq "SetRoot")
+    {
+      ycp::Return(undef);
+      $root = shift @arguments;
+      y2milestone("Set root to '$root'");
+      my $fn = shift @arguments || "/etc/$netd.conf";
+      $fn = File::Spec->canonpath(File::Spec->catfile($root, $fn)) unless 
$strip;
+
+      $base_file = strip_pwd ($fn);
+      next;
+    }
     if ($command =~ "Netd|Inetd|Xinetd")
     {
        # reply to the client (this actually gets eaten by the ScriptingAgent)
@@ -694,6 +711,7 @@
        print "\n";
        $netd = ($command eq "Xinetd")? "xinetd": "inetd";
        my $fn = shift @arguments || "/etc/$netd.conf";
+        $fn = File::Spec->canonpath(File::Spec->catfile($root, $fn)) unless 
$strip;
 
        $base_file = strip_pwd ($fn);
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-3.1.102/package/yast2.changes 
new/yast2-3.1.103/package/yast2.changes
--- old/yast2-3.1.102/package/yast2.changes     2014-08-27 14:27:18.000000000 
+0200
+++ new/yast2-3.1.103/package/yast2.changes     2014-09-01 14:52:08.000000000 
+0200
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Thu Aug 28 11:17:16 UTC 2014 - jreidin...@suse.com
+
+- fix using changed root in netd agent so it can be used in
+  installation (bnc#893965)
+- 3.1.103
+
+-------------------------------------------------------------------
 Wed Aug 27 13:24:34 CEST 2014 - loci...@suse.com
 
 - Lazy-loading SuSEfirewall2 services - some new services can be
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-3.1.102/package/yast2.spec 
new/yast2-3.1.103/package/yast2.spec
--- old/yast2-3.1.102/package/yast2.spec        2014-08-27 14:27:18.000000000 
+0200
+++ new/yast2-3.1.103/package/yast2.spec        2014-09-01 14:52:08.000000000 
+0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        3.1.102
+Version:        3.1.103
 Release:        0
 URL:            https://github.com/yast/yast-yast2
 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to