Mailinglist Archive: opensuse-commit (926 mails)
| < Previous | Next > |
commit yast2-core for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Mon, 21 Dec 2009 14:30:53 +0100
- Message-id: <20091221133053.EF7CC202A6@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-core for openSUSE:Factory
checked in at Mon Dec 21 14:30:53 CET 2009.
--------
--- yast2-core/yast2-core.changes 2009-08-14 17:48:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-core/yast2-core.changes 2009-12-18
14:14:59.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Dec 18 12:43:39 CET 2009 - aschnell@xxxxxxx
+
+- allow Y2DIR to be a list of paths separated by ":"
+- 2.19.0
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-core-2.18.19.tar.bz2
New:
----
yast2-core-2.19.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-core.spec ++++++
--- /var/tmp/diff_new_pack.O6JI2B/_old 2009-12-21 14:30:14.000000000 +0100
+++ /var/tmp/diff_new_pack.O6JI2B/_new 2009-12-21 14:30:14.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-core (Version 2.18.19)
+# spec file for package yast2-core (Version 2.19.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,15 +19,15 @@
Name: yast2-core
-Version: 2.18.19
+Version: 2.19.0
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-core-2.18.19.tar.bz2
+Source0: yast2-core-2.19.0.tar.bz2
Prefix: /usr
Group: System/YaST
-License: GPL v2 or later
+License: GPLv2+
# obviously
-BuildRequires: gcc-c++
+BuildRequires: boost-devel gcc-c++
# we have a parser
BuildRequires: bison flex
# needed for all yast packages
@@ -55,7 +55,7 @@
library for the YCP scripting language used in YaST2.
%package devel
-License: GPL v2 or later
+License: GPLv2+
Requires: yast2-core = %version
Group: Development/Libraries
Summary: YaST2 - Core Libraries
@@ -73,7 +73,7 @@
applications using the YaST2 YCP interpreter.
%prep
-%setup -n yast2-core-2.18.19
+%setup -n yast2-core-2.19.0
%build
%ifarch %arm
++++++ yast2-core-2.18.19.tar.bz2 -> yast2-core-2.19.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-2.18.19/VERSION
new/yast2-core-2.19.0/VERSION
--- old/yast2-core-2.18.19/VERSION 2009-08-14 17:04:24.000000000 +0200
+++ new/yast2-core-2.19.0/VERSION 2009-12-18 12:43:32.000000000 +0100
@@ -1 +1 @@
-2.18.19
+2.19.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-core-2.18.19/agent-modules/testsuite/tests/dir.scr
new/yast2-core-2.19.0/agent-modules/testsuite/tests/dir.scr
--- old/yast2-core-2.18.19/agent-modules/testsuite/tests/dir.scr
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.19.0/agent-modules/testsuite/tests/dir.scr 2009-12-18
13:05:51.000000000 +0100
@@ -0,0 +1,6 @@
+.
+
+`ag_modules(
+ `ModulesConf("tests/dir.in.test")
+)
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-core-2.18.19/agent-modules/testsuite/tests/missing.scr
new/yast2-core-2.19.0/agent-modules/testsuite/tests/missing.scr
--- old/yast2-core-2.18.19/agent-modules/testsuite/tests/missing.scr
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.19.0/agent-modules/testsuite/tests/missing.scr
2009-12-18 13:05:51.000000000 +0100
@@ -0,0 +1,6 @@
+.
+
+`ag_modules(
+ `ModulesConf("tests/missing.in.test")
+)
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-core-2.18.19/agent-modules/testsuite/tests/read1.scr
new/yast2-core-2.19.0/agent-modules/testsuite/tests/read1.scr
--- old/yast2-core-2.18.19/agent-modules/testsuite/tests/read1.scr
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.19.0/agent-modules/testsuite/tests/read1.scr
2009-12-18 13:05:51.000000000 +0100
@@ -0,0 +1,6 @@
+.
+
+`ag_modules(
+ `ModulesConf("tests/read1.in.test")
+)
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-core-2.18.19/agent-modules/testsuite/tests/write1.scr
new/yast2-core-2.19.0/agent-modules/testsuite/tests/write1.scr
--- old/yast2-core-2.18.19/agent-modules/testsuite/tests/write1.scr
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.19.0/agent-modules/testsuite/tests/write1.scr
2009-12-18 13:05:45.000000000 +0100
@@ -0,0 +1,6 @@
+.
+
+`ag_modules(
+ `ModulesConf("tests/write1.in.test")
+)
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-core-2.18.19/agent-modules/testsuite/tests/write2.scr
new/yast2-core-2.19.0/agent-modules/testsuite/tests/write2.scr
--- old/yast2-core-2.18.19/agent-modules/testsuite/tests/write2.scr
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.19.0/agent-modules/testsuite/tests/write2.scr
2009-12-18 13:05:52.000000000 +0100
@@ -0,0 +1,6 @@
+.
+
+`ag_modules(
+ `ModulesConf("tests/write2.in.test")
+)
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-core-2.18.19/agent-modules/testsuite/tests/write3.scr
new/yast2-core-2.19.0/agent-modules/testsuite/tests/write3.scr
--- old/yast2-core-2.18.19/agent-modules/testsuite/tests/write3.scr
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.19.0/agent-modules/testsuite/tests/write3.scr
2009-12-18 13:05:52.000000000 +0100
@@ -0,0 +1,6 @@
+.
+
+`ag_modules(
+ `ModulesConf("tests/write3.in.test")
+)
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-2.18.19/configure
new/yast2-core-2.19.0/configure
--- old/yast2-core-2.18.19/configure 2009-08-14 17:35:21.000000000 +0200
+++ new/yast2-core-2.19.0/configure 2009-12-18 13:06:38.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-core 2.18.19.
+# Generated by GNU Autoconf 2.63 for yast2-core 2.19.0.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -745,8 +745,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-core'
PACKAGE_TARNAME='yast2-core'
-PACKAGE_VERSION='2.18.19'
-PACKAGE_STRING='yast2-core 2.18.19'
+PACKAGE_VERSION='2.19.0'
+PACKAGE_STRING='yast2-core 2.19.0'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1549,7 +1549,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-core 2.18.19 to adapt to many kinds of systems.
+\`configure' configures yast2-core 2.19.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1620,7 +1620,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-core 2.18.19:";;
+ short | recursive ) echo "Configuration of yast2-core 2.19.0:";;
esac
cat <<\_ACEOF
@@ -1733,7 +1733,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-core configure 2.18.19
+yast2-core configure 2.19.0
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1747,7 +1747,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-core $as_me 2.18.19, which was
+It was created by yast2-core $as_me 2.19.0, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2727,7 +2727,7 @@
# Define the identity of the package.
PACKAGE='yast2-core'
- VERSION='2.18.19'
+ VERSION='2.19.0'
cat >>confdefs.h <<_ACEOF
@@ -2849,7 +2849,7 @@
-VERSION="2.18.19"
+VERSION="2.19.0"
RPMNAME="yast2-core"
MAINTAINER="Martin Vidner <mvidner@xxxxxxx>"
@@ -19835,7 +19835,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-core $as_me 2.18.19, which was
+This file was extended by yast2-core $as_me 2.19.0, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19898,7 +19898,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-core config.status 2.18.19
+yast2-core config.status 2.19.0
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-2.18.19/configure.in
new/yast2-core-2.19.0/configure.in
--- old/yast2-core-2.18.19/configure.in 2009-08-14 17:35:04.000000000 +0200
+++ new/yast2-core-2.19.0/configure.in 2009-12-18 13:06:29.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-core
dnl
-dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-core, 2.18.19, http://bugs.opensuse.org/, yast2-core)
+AC_INIT(yast2-core, 2.19.0, http://bugs.opensuse.org/, yast2-core)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.18.19"
+VERSION="2.19.0"
RPMNAME="yast2-core"
MAINTAINER="Martin Vidner <mvidner@xxxxxxx>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-core-2.18.19/libycp/src/include/ycp/pathsearch.h
new/yast2-core-2.19.0/libycp/src/include/ycp/pathsearch.h
--- old/yast2-core-2.18.19/libycp/src/include/ycp/pathsearch.h 2009-04-10
09:49:52.000000000 +0200
+++ new/yast2-core-2.19.0/libycp/src/include/ycp/pathsearch.h 2009-12-18
10:59:15.000000000 +0100
@@ -29,8 +29,10 @@
#include <string>
#include <list>
+#include <vector>
using std::string;
+using std::vector;
class Y2PathSearch
@@ -100,9 +102,13 @@
protected:
static bool searchPrefixWarn;
+ static vector<string> getPaths();
+
private:
static int defaultComponentLevel ();
+ static vector<string> paths;
+ static void initializePaths();
};
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-2.18.19/libycp/src/pathsearch.cc
new/yast2-core-2.19.0/libycp/src/pathsearch.cc
--- old/yast2-core-2.18.19/libycp/src/pathsearch.cc 2009-04-10
09:49:52.000000000 +0200
+++ new/yast2-core-2.19.0/libycp/src/pathsearch.cc 2009-12-18
12:59:46.000000000 +0100
@@ -28,105 +28,103 @@
#include <sys/stat.h>
#include <sys/time.h>
#include <unistd.h>
+#include <boost/algorithm/string.hpp>
#include <ycp/y2log.h>
#include "pathsearch.h"
-// watch out, duplicated in YCPPathSearch::initialize
-static const char *paths[] =
+
+bool Y2PathSearch::searchPrefixWarn = true;
+
+
+vector<string>
+Y2PathSearch::getPaths()
{
- "/y2update", // Necessary during installation, but
- // can be achieved using -I and -M in
- // the yast2 start script
- // And more unimplemented stuff for scrconf...
- "Y2DIR", // replace with env. var. Y2DIR
- "HOME", // replace with users home dir + /.yast2
- YAST2DIR
-};
+ vector<string> ret;
+ ret.push_back(string("/y2update"));
-static const int NUM_LEVELS = sizeof (paths) / sizeof (paths[0]);
+ const char* y2dir = getenv("Y2DIR");
+ if (y2dir)
+ {
+ vector<string> y2dirs;
+ boost::split(y2dirs, y2dir, boost::is_any_of(":"));
+ for (vector<string>::const_iterator it = y2dirs.begin(); it !=
y2dirs.end(); ++it)
+ {
+ if (*it != YAST2DIR) // prevent path duplication
+ ret.push_back(*it);
+ }
+ }
+
+ const char* home = getenv("HOME");
+ if (home)
+ {
+ ret.push_back(string(home) + "/.yast2");
+ }
+
+ ret.push_back(string(YAST2DIR));
+
+ y2debug("getPaths %s", boost::join(ret, " ").c_str());
+
+ return ret;
+}
+
+
+vector<string> Y2PathSearch::paths;
+
+
+void
+Y2PathSearch::initializePaths()
+{
+ if (paths.empty())
+ paths = getPaths();
+}
-bool Y2PathSearch::searchPrefixWarn = true;
int
-Y2PathSearch::numberOfComponentLevels ()
+Y2PathSearch::numberOfComponentLevels()
{
- return NUM_LEVELS;
+ initializePaths();
+ return paths.size();
}
string
Y2PathSearch::searchPath (WHAT what, int level)
{
- static string *my_paths = 0;
-
- if (!my_paths)
- {
- // note: never deleted
- my_paths = new string [NUM_LEVELS];
+ initializePaths();
- const char *home = getenv ("HOME");
- const char *y2dir = getenv ("Y2DIR");
-
- for (int i = 0; i < NUM_LEVELS; i++)
- {
- // #330965, avoid publicly writable dirs in search path
- // (we return a nonexistent dir because the API does not
- // allow us to say Skip, and a cleanup patch to fix that
- // would be too large)
- static const char * not_there = YAST2DIR "/not-there";
- if (strcmp (paths[i], "HOME") == 0)
- {
- if (home)
- my_paths[i] = string (home) + "/.yast2";
- else
- my_paths[i] = string (not_there);
- }
- else if (strcmp (paths[i], "Y2DIR") == 0)
- {
- if (y2dir
- && (strcmp (YAST2DIR, y2dir) != 0)) //
prevent path duplication
- my_paths[i] = string (y2dir);
- else
- my_paths[i] = string (not_there);
- }
- else
- {
- my_paths[i] = string (paths[i]);
- }
- }
- }
+ int levels = paths.size();
switch (what)
{
case EXECCOMP:
- if (level == NUM_LEVELS - 1) // FIXME
+ if (level == levels - 1) // FIXME
{
return EXECCOMPDIR;
}
else
{
- return my_paths[level];
+ return paths[level];
}
break;
case PLUGIN:
- if (level == NUM_LEVELS - 1) // FIXME
+ if (level == levels - 1) // FIXME
{
return PLUGINDIR;
}
else
{
- return my_paths[level] + "/plugin";
+ return paths[level] + "/plugin";
}
break;
default:
break;
}
- return my_paths[level];
+ return paths[level];
}
@@ -166,7 +164,10 @@
string
Y2PathSearch::findy2 (string filename, int mode, int level)
{
- for (int i = 0; i < NUM_LEVELS; i++)
+ initializePaths();
+
+ int levels = paths.size();
+ for (int i = 0; i < levels; i++)
{
// for level == -1, all levels are scanned
if ((level >= 0) && (i != level))
@@ -180,7 +181,7 @@
if (access (pathname.c_str(), mode) == 0)
{
// FIXME: this check is different for clients and for modules - see
find
- if( searchPrefixWarn && i != NUM_LEVELS-1 )
+ if( searchPrefixWarn && i != levels - 1 )
{
y2warning( "Using special search prefix '%s' for
'%s'",searchPath (GENERIC, i).c_str(), pathname.c_str() );
}
@@ -247,7 +248,10 @@
int
Y2PathSearch::defaultComponentLevel ()
{
- for (int i = 0; i < NUM_LEVELS; i++)
+ initializePaths();
+
+ int levels = paths.size();
+ for (int i = 0; i < levels; i++)
{
if (searchPath (GENERIC, i) == YAST2DIR)
{
@@ -255,7 +259,7 @@
}
}
/* NOTREACHED */
- return NUM_LEVELS - 1;
+ return levels - 1;
}
@@ -264,7 +268,7 @@
{
// Determine current component level
int current_level = defaultComponentLevel ();
- char *levelstring = getenv ("Y2LEVEL");
+ const char* levelstring = getenv ("Y2LEVEL");
if (levelstring)
{
current_level = atoi (levelstring);
@@ -277,26 +281,15 @@
bool YCPPathSearch::initialized = false;
-// watch out, duplicated in char *paths[]
+
void
YCPPathSearch::initialize (Kind kind, const char *suffix)
{
- const char *home = getenv ("HOME");
- const char *y2dir = getenv ("Y2DIR");
-
searchPrefixWarn = (getenv ("Y2SILENTSEARCH") == NULL);
- addPath (kind, string (YAST2DIR) + suffix);
- if (home)
- {
- string homey2 = string (home) + "/.yast2";
- addPath (kind, homey2 + suffix);
- }
- if (y2dir)
- {
- addPath (kind, string (y2dir) + suffix);
- }
- addPath (kind, string ("/y2update") + suffix);
+ vector<string> paths = getPaths();
+ for (vector<string>::const_reverse_iterator it = paths.rbegin(); it !=
paths.rend(); ++it)
+ addPath(kind, *it + suffix);
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |