Merge branch 'openSUSE-13_2'

Conflicts:
	package/yast2-core.changes
	package/yast2-core.spec
	Rakefile

.gitignore

@@ -10,6 +10,7 @@ Makefile
 Makefile.in
 /Makefile.am
 Makefile.am.common
+compile
 config.h
 config.cache
 config.guess

agent-any/src/AnyAgent.cc

@@ -740,7 +740,7 @@ AnyAgent::readFile (const YCPValue & arg)
     {
         const char *s = ss.c_str();
         // Check modify time if we can use cache
-        if (stat (s, &buf) != 0)
+        if (stat (targetPath(s).c_str(), &buf) != 0)
         {
             mtime = 0;	// error case: reset mtime
             if (errno == ENOENT)

base/Makefile.am

@@ -2,6 +2,6 @@
 # Makefile.am for core/base
 #
 
-SUBDIRS = src tools
+SUBDIRS = src tools testsuite
 
 EXTRA_DIST = test-helper.exp

base/testsuite/.gitignore

@@ -0,0 +1,2 @@
+*.log
+*.trs

base/testsuite/Makefile.am

@@ -0,0 +1,9 @@
+ITESTS = \
+  target_root.ycp
+
+EXTRA_DIST = $(ITESTS) y2base.sh
+
+check-local:
+	for t in $(ITESTS); do \
+	  ./y2base.sh $$t || { cat $${t%.*}.log; exit 1; }; \
+	done

base/testsuite/data/toplevel/target_root

@@ -0,0 +1 @@
+BOOT_IMAGE=fbdev ro root=801

base/testsuite/target_root.ycp

@@ -0,0 +1,41 @@
+{
+    any with_scr_root(string root, any () action) {
+        string component = sformat("chroot=%1:scr", root);
+        boolean check_version = false;
+        integer handle = WFM::SCROpen(component, check_version);
+        WFM::SCRSetDefault(handle);
+
+        any result = action();
+
+        WFM::SCRSetDefault(0);
+        WFM::SCRClose(handle);
+        return result;
+    }
+
+    boolean test_anyagent() {
+        SCR::RegisterAgent(
+          .tested,
+          `ag_anyagent(
+            `Description (
+              `File ("/toplevel/target_root"),
+              "#\n",                // Comment
+              true,                 // read-only
+              `List (
+                `String ("^ \n"),
+                " "
+              )
+            )
+          )
+        );
+
+        any read = SCR::Read(.tested);
+
+        any expected = ["BOOT_IMAGE=fbdev", "ro", "root=801"];
+        y2milestone ("Expected: %1", expected);
+        y2milestone ("Read:     %1", read);
+        return read == expected;
+    }
+
+    string root = sformat("%1/data", WFM::Args(0));
+    return with_scr_root(root, test_anyagent);
+}

base/testsuite/y2base.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+ROOT=../..
+LIBS=src/.libs
+AG_ANY_DIR=$ROOT/agent-any/$LIBS
+# The agent is looked for not in $Y2DIR but in $Y2DIR/plugin so create 'plugin'
+ln -snf . $AG_ANY_DIR/plugin
+export Y2DIR=$AG_ANY_DIR
+export LD_LIBRARY_PATH="\
+$ROOT/liby2util-r/$LIBS:\
+$ROOT/libycp/$LIBS:\
+$ROOT/liby2/$LIBS:\
+$ROOT/libscr/$LIBS:\
+$ROOT/wfm/$LIBS:\
+$ROOT/scr/$LIBS\
+"
+# ignore incompatible ruby-bindings while developing
+export Y2DISABLELANGUAGEPLUGINS=1
+../$LIBS/y2base -l ${1%.*}.log ./$1 -S "($(pwd))" testsuite

package/yast2-core.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Nov 25 09:59:49 UTC 2014 - mvidner@suse.com
+
+- ag_any: respect target root also when the file
+  does not exist in the original root (boo#903747).
+  If applied at installation time as a DUD, it fixes
+  "Internal error... in SaveModulesToLoad" during
+  an upgrade to oS 13.2.
+- 3.1.14
+
 -------------------------------------------------------------------
 Fri Oct 24 12:29:04 UTC 2014 - lslezak@suse.cz
 

package/yast2-core.spec

@@ -18,7 +18,7 @@
 
 
 Name:           yast2-core
-Version:        3.1.13
+Version:        3.1.14
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build