Hello community,
here is the log from the commit of package yast2-core for openSUSE:Factory
checked in at 2014-10-11 19:25:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-core (Old)
and /work/SRC/openSUSE:Factory/.yast2-core.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-core"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-core/yast2-core.changes 2014-09-10
07:28:09.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-core.new/yast2-core.changes
2014-10-11 19:25:52.000000000 +0200
@@ -1,0 +2,12 @@
+Wed Oct 8 12:02:35 UTC 2014 - mvid...@suse.com
+
+- Fixed searching for programs in Y2DIR
+ (gh#yast/yast-ruby-bindings#107)
+- 3.1.12
+
+-------------------------------------------------------------------
+Wed Oct 8 07:55:04 UTC 2014 - mvid...@suse.com
+
+- Allow SCR.Read(.target.yast2, ...) on chroots (bnc#891053).
+
+-------------------------------------------------------------------
Old:
----
yast2-core-3.1.11.tar.bz2
New:
----
yast2-core-3.1.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-core.spec ++++++
--- /var/tmp/diff_new_pack.L1wxS4/_old 2014-10-11 19:25:53.000000000 +0200
+++ /var/tmp/diff_new_pack.L1wxS4/_new 2014-10-11 19:25:53.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-core
-Version: 3.1.11
+Version: 3.1.12
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-core-3.1.11.tar.bz2 -> yast2-core-3.1.12.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-3.1.11/MAINTAINER
new/yast2-core-3.1.12/MAINTAINER
--- old/yast2-core-3.1.11/MAINTAINER 2014-09-08 11:25:22.000000000 +0200
+++ new/yast2-core-3.1.12/MAINTAINER 2014-10-08 14:29:10.000000000 +0200
@@ -1 +1 @@
-Martin Vidner <mvid...@suse.cz>
+Deprecated file. Use `osc maintainer yast2-core` instead.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-3.1.11/agent-system/src/SystemAgent.cc
new/yast2-core-3.1.12/agent-system/src/SystemAgent.cc
--- old/yast2-core-3.1.11/agent-system/src/SystemAgent.cc 2014-09-08
11:25:22.000000000 +0200
+++ new/yast2-core-3.1.12/agent-system/src/SystemAgent.cc 2014-10-08
14:29:11.000000000 +0200
@@ -363,7 +363,9 @@
return YCPNull ();
}
- filename = targetPath(filename);
+ // .yast2 needs special handling as it searches in y2path (bnc#891053)
+ if (cmd != "yast2")
+ filename = targetPath(filename);
if (cmd == "string")
{
@@ -474,10 +476,24 @@
if (cmd == "yast2")
{
- string tmp = Y2PathSearch::findy2 ("data/" + filename); // FIXME
use ydatadir
- if (!tmp.empty ())
+ string path;
+ bool found = false;
+ for (int i = 0; i < Y2PathSearch::numberOfComponentLevels(); ++i)
+ {
+ path = Y2PathSearch::searchPath(Y2PathSearch::GENERIC, i);
+ path.append("/data/" + filename);
+ // respect changed root
+ path = targetPath(path);
+ // try if the file exists and we can read it
+ if (access(path.c_str(), R_OK) == 0)
+ {
+ found = true;
+ break;
+ }
+ }
+ if (found)
{
- filename = tmp;
+ filename = path;
}
else
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-3.1.11/liby2/Makefile.am
new/yast2-core-3.1.12/liby2/Makefile.am
--- old/yast2-core-3.1.11/liby2/Makefile.am 2014-09-08 11:25:22.000000000
+0200
+++ new/yast2-core-3.1.12/liby2/Makefile.am 2014-10-08 14:29:11.000000000
+0200
@@ -2,4 +2,4 @@
# Makefile.am for core/liby2
#
-SUBDIRS = src
+SUBDIRS = src testsuite
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-3.1.11/liby2/src/Y2CCProgram.cc
new/yast2-core-3.1.12/liby2/src/Y2CCProgram.cc
--- old/yast2-core-3.1.11/liby2/src/Y2CCProgram.cc 2014-09-08
11:25:22.000000000 +0200
+++ new/yast2-core-3.1.12/liby2/src/Y2CCProgram.cc 2014-10-08
14:29:11.000000000 +0200
@@ -65,11 +65,18 @@
}
string file;
+ struct stat buf;
if (index (name, '/') == NULL) // no slash found
{
- file = Y2PathSearch::findy2exe (root, name, creates_servers,
- creates_non_y2, level);
+ for (int i = 0; i < Y2PathSearch::numberOfComponentLevels(); ++i)
+ {
+ file = Y2PathSearch::findy2exe (root, name, creates_servers,
+ creates_non_y2, i);
+ // stop if we found file
+ if (!file.empty() && access (file.c_str (), X_OK) == 0)
+ break;
+ }
if (file.empty ()) // not found
return 0;
}
@@ -80,7 +87,6 @@
file = name;
}
- struct stat buf;
if (stat (file.c_str (), &buf) == 0)
{
// Check at least if it is executable (for others) and
@@ -91,6 +97,11 @@
return new Y2ProgramComponent (root, file.c_str (), name,
creates_non_y2, level);
}
+ else
+ {
+ y2error("Found program file '%s' is not regular file or
executable",
+ file.c_str());
+ }
}
return 0; // no such file or no read rights for directory
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-3.1.11/liby2/testsuite/Makefile.am
new/yast2-core-3.1.12/liby2/testsuite/Makefile.am
--- old/yast2-core-3.1.11/liby2/testsuite/Makefile.am 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-core-3.1.12/liby2/testsuite/Makefile.am 2014-10-08
14:29:11.000000000 +0200
@@ -0,0 +1,3 @@
+TESTS = t-program-search
+
+EXTRA_DIST = $(TESTS) servers_non_y2/ag_program_search
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-core-3.1.11/liby2/testsuite/servers_non_y2/ag_program_search
new/yast2-core-3.1.12/liby2/testsuite/servers_non_y2/ag_program_search
--- old/yast2-core-3.1.11/liby2/testsuite/servers_non_y2/ag_program_search
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-3.1.12/liby2/testsuite/servers_non_y2/ag_program_search
2014-10-08 14:29:11.000000000 +0200
@@ -0,0 +1,4 @@
+#!/bin/sh
+# a trivial agent
+read COMMAND
+echo "(42)"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-3.1.11/liby2/testsuite/t-program-search
new/yast2-core-3.1.12/liby2/testsuite/t-program-search
--- old/yast2-core-3.1.11/liby2/testsuite/t-program-search 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-core-3.1.12/liby2/testsuite/t-program-search 2014-10-08
14:29:11.000000000 +0200
@@ -0,0 +1,7 @@
+#!/bin/bash
+MYDIR=$(dirname $0)
+PATH=$MYDIR/../../base/src:/usr/lib/YaST2/bin:$PATH
+# This will return
+# 0 if ag_program_search can be found
+# 5 if it cannot
+echo '`Read(.)' | Y2DIR=$MYDIR y2base stdio ag_program_search
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-3.1.11/package/yast2-core.changes
new/yast2-core-3.1.12/package/yast2-core.changes
--- old/yast2-core-3.1.11/package/yast2-core.changes 2014-09-08
11:25:23.000000000 +0200
+++ new/yast2-core-3.1.12/package/yast2-core.changes 2014-10-08
14:29:11.000000000 +0200
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Wed Oct 8 12:02:35 UTC 2014 - mvid...@suse.com
+
+- Fixed searching for programs in Y2DIR
+ (gh#yast/yast-ruby-bindings#107)
+- 3.1.12
+
+-------------------------------------------------------------------
+Wed Oct 8 07:55:04 UTC 2014 - mvid...@suse.com
+
+- Allow SCR.Read(.target.yast2, ...) on chroots (bnc#891053).
+
+-------------------------------------------------------------------
Mon Sep 8 08:59:10 UTC 2014 - mvid...@suse.com
- Enable buffering for parsing agent output (bnc#854809).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-3.1.11/package/yast2-core.spec
new/yast2-core-3.1.12/package/yast2-core.spec
--- old/yast2-core-3.1.11/package/yast2-core.spec 2014-09-08
11:25:23.000000000 +0200
+++ new/yast2-core-3.1.12/package/yast2-core.spec 2014-10-08
14:29:11.000000000 +0200
@@ -18,7 +18,7 @@
Name: yast2-core
-Version: 3.1.11
+Version: 3.1.12
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
