Hello community,
here is the log from the commit of package yast2 for openSUSE:Factory
checked in at Wed Aug 31 10:53:26 CEST 2011.
--------
--- yast2/yast2.changes 2011-08-29 13:06:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2011-08-31 09:53:12.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Aug 31 07:40:54 UTC 2011 - lslezak@suse.cz
+
+- fixed trusting a GPG key (wrong id check) (bnc#713068)
+- added String::FindMountPoint() function (moved from yast2-wagon
+ to share it with other modules)
+- 2.21.13
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-2.21.12.tar.bz2
New:
----
yast2-2.21.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.CDbqlM/_old 2011-08-31 10:53:04.000000000 +0200
+++ /var/tmp/diff_new_pack.CDbqlM/_new 2011-08-31 10:53:04.000000000 +0200
@@ -19,11 +19,11 @@
Name: yast2
-Version: 2.21.12
+Version: 2.21.13
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.21.12.tar.bz2
+Source0: yast2-2.21.13.tar.bz2
Prefix: /usr
@@ -130,7 +130,7 @@
installation with YaST2.
%prep
-%setup -n yast2-2.21.12
+%setup -n yast2-2.21.13
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-2.21.12.tar.bz2 -> yast2-2.21.13.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.12/VERSION new/yast2-2.21.13/VERSION
--- old/yast2-2.21.12/VERSION 2011-08-29 13:03:19.000000000 +0200
+++ new/yast2-2.21.13/VERSION 2011-08-31 09:51:32.000000000 +0200
@@ -1 +1 @@
-2.21.12
+2.21.13
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.12/configure new/yast2-2.21.13/configure
--- old/yast2-2.21.12/configure 2011-08-29 13:03:52.000000000 +0200
+++ new/yast2-2.21.13/configure 2011-08-31 09:52:06.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for yast2 2.21.12.
+# Generated by GNU Autoconf 2.68 for yast2 2.21.13.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2'
PACKAGE_TARNAME='yast2'
-PACKAGE_VERSION='2.21.12'
-PACKAGE_STRING='yast2 2.21.12'
+PACKAGE_VERSION='2.21.13'
+PACKAGE_STRING='yast2 2.21.13'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1232,7 +1232,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 2.21.12 to adapt to many kinds of systems.
+\`configure' configures yast2 2.21.13 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1303,7 +1303,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2 2.21.12:";;
+ short | recursive ) echo "Configuration of yast2 2.21.13:";;
esac
cat <<\_ACEOF
@@ -1383,7 +1383,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2 configure 2.21.12
+yast2 configure 2.21.13
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1400,7 +1400,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 $as_me 2.21.12, which was
+It was created by yast2 $as_me 2.21.13, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2330,7 +2330,7 @@
# Define the identity of the package.
PACKAGE='yast2'
- VERSION='2.21.12'
+ VERSION='2.21.13'
cat >>confdefs.h <<_ACEOF
@@ -2452,7 +2452,7 @@
-VERSION="2.21.12"
+VERSION="2.21.13"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
@@ -3498,7 +3498,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2 $as_me 2.21.12, which was
+This file was extended by yast2 $as_me 2.21.13, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3551,7 +3551,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2 config.status 2.21.12
+yast2 config.status 2.21.13
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.12/configure.in new/yast2-2.21.13/configure.in
--- old/yast2-2.21.12/configure.in 2011-08-29 13:03:50.000000000 +0200
+++ new/yast2-2.21.13/configure.in 2011-08-31 09:52:04.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.21.12, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.21.13, http://bugs.opensuse.org/, yast2)
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.21.12"
+VERSION="2.21.13"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.12/library/modules/Version.ycp new/yast2-2.21.13/library/modules/Version.ycp
--- old/yast2-2.21.12/library/modules/Version.ycp 2011-08-29 13:03:57.000000000 +0200
+++ new/yast2-2.21.13/library/modules/Version.ycp 2011-08-31 09:52:10.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.21.12";
+global string yast2 = "2.21.13";
/* EOF */
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.12/library/packages/src/SignatureCheckDialogs.ycp new/yast2-2.21.13/library/packages/src/SignatureCheckDialogs.ycp
--- old/yast2-2.21.12/library/packages/src/SignatureCheckDialogs.ycp 2011-08-16 11:02:38.000000000 +0200
+++ new/yast2-2.21.13/library/packages/src/SignatureCheckDialogs.ycp 2011-08-30 16:42:21.000000000 +0200
@@ -942,7 +942,7 @@
UI::CloseDialog();
- return ret == `import;
+ return ret == `trust;
}
boolean RunSimpleErrorPopup(string heading, string description_text,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.12/library/types/src/String.ycp new/yast2-2.21.13/library/types/src/String.ycp
--- old/yast2-2.21.12/library/types/src/String.ycp 2011-07-01 14:48:59.000000000 +0200
+++ new/yast2-2.21.13/library/types/src/String.ycp 2011-08-31 09:51:52.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: String manipulation routines
* Authors: Michal Svec
*
- * $Id: String.ycp 64618 2011-06-28 13:57:30Z lslezak $
+ * $Id: String.ycp 65459 2011-08-31 07:51:51Z lslezak $
*/
{
@@ -1330,5 +1330,29 @@
return search(str, test) == 0;
}
+/*
+* Find a mount point for given directory/file path. Returns "/" if no mount point matches
+* @param dir requested path , e.g. "/usr/share"
+* @param dirs list of mount points, e.g. [ "/", "/usr", "/boot" ]
+* @return string a mount point from the input list or "/" if not found
+*/
+global string FindMountPoint(string dir, list<string> dirs)
+{
+ while (dir != nil && dir != "" && !contains(dirs, dir))
+ {
+ // strip the last path component and try it again
+ list<string> comps = splitstring(dir, "/");
+ comps = remove(comps, size(comps) - 1);
+ dir = mergestring(comps, "/");
+ }
+
+ if (dir == nil || dir == "")
+ {
+ dir = "/";
+ }
+
+ return dir;
+}
+
/* EOF */
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.12/library/types/testsuite/tests/FindMountPoint.out new/yast2-2.21.13/library/types/testsuite/tests/FindMountPoint.out
--- old/yast2-2.21.12/library/types/testsuite/tests/FindMountPoint.out 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.21.13/library/types/testsuite/tests/FindMountPoint.out 2011-06-20 14:56:54.000000000 +0200
@@ -0,0 +1,14 @@
+Dump Test nil
+Return /
+Return /
+Return /
+Dump Test empty string
+Return /
+Return /
+Return /
+Dump Test valid values
+Return /
+Return /usr
+Return /usr
+Return /usr
+Return /usr/share
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.12/library/types/testsuite/tests/FindMountPoint.ycp new/yast2-2.21.13/library/types/testsuite/tests/FindMountPoint.ycp
--- old/yast2-2.21.12/library/types/testsuite/tests/FindMountPoint.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-2.21.13/library/types/testsuite/tests/FindMountPoint.ycp 2011-08-31 09:59:33.000000000 +0200
@@ -0,0 +1,24 @@
+{
+
+include "testsuite.ycp";
+
+import "String";
+
+//import "Wagon";
+DUMP("Test nil");
+TEST(``(String::FindMountPoint(nil, nil)), [], nil);
+TEST(``(String::FindMountPoint(nil, [])), [], nil);
+TEST(``(String::FindMountPoint(nil, ["/boot", "/"])), [], nil);
+
+DUMP("Test empty string");
+TEST(``(String::FindMountPoint("", nil)), [], nil);
+TEST(``(String::FindMountPoint("", [])), [], nil);
+TEST(``(String::FindMountPoint("", ["/boot", "/"])), [], nil);
+
+DUMP("Test valid values");
+TEST(``(String::FindMountPoint("/", ["/boot", "/", "/usr"])), [], nil);
+TEST(``(String::FindMountPoint("/usr", ["/boot", "/", "/usr"])), [], nil);
+TEST(``(String::FindMountPoint("/usr/", ["/boot", "/", "/usr"])), [], nil);
+TEST(``(String::FindMountPoint("/usr/share/locale", ["/boot", "/", "/usr"])), [], nil);
+TEST(``(String::FindMountPoint("/usr/share/locale", ["/boot", "/", "/usr", "/usr/share"])), [], nil);
+}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org