Hello community,
here is the log from the commit of package yast2
checked in at Fri Feb 23 13:07:59 CET 2007.
--------
--- yast2/yast2.changes 2007-02-19 16:09:50.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2007-02-23 13:03:57.986576000 +0100
@@ -1,0 +2,7 @@
+Fri Feb 23 11:30:05 CET 2007 - lslezak@suse.cz
+
+- error handling in Package::Available*() - return nil if no
+ installation source is available (#225484)
+- 2.15.12
+
+-------------------------------------------------------------------
Old:
----
yast2-2.15.11.tar.bz2
New:
----
yast2-2.15.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.o32432/_old 2007-02-23 13:07:52.000000000 +0100
+++ /var/tmp/diff_new_pack.o32432/_new 2007-02-23 13:07:52.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.15.11)
+# spec file for package yast2 (Version 2.15.12)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2
-Version: 2.15.11
+Version: 2.15.12
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.15.11.tar.bz2
+Source0: yast2-2.15.12.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite
# UI::RunInTerminal builtin
@@ -97,7 +97,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.15.11
+%setup -n yast2-2.15.12
%build
%{prefix}/bin/y2tool y2autoconf
@@ -202,6 +202,10 @@
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog
+* Fri Feb 23 2007 - lslezak@suse.cz
+- error handling in Package::Available*() - return nil if no
+ installation source is available (#225484)
+- 2.15.12
* Mon Feb 19 2007 - lslezak@suse.cz
- NetworkPopup - fixed NFS browsing (the same problem was
in #71064), display scan results in a simple popup
++++++ yast2-2.15.11.tar.bz2 -> yast2-2.15.12.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.11/configure new/yast2-2.15.12/configure
--- old/yast2-2.15.11/configure 2007-02-19 16:02:14.000000000 +0100
+++ new/yast2-2.15.12/configure 2007-02-23 13:02:16.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2 2.15.11.
+# Generated by GNU Autoconf 2.60 for yast2 2.15.12.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2'
PACKAGE_TARNAME='yast2'
-PACKAGE_VERSION='2.15.11'
-PACKAGE_STRING='yast2 2.15.11'
+PACKAGE_VERSION='2.15.12'
+PACKAGE_STRING='yast2 2.15.12'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1183,7 +1183,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.15.11 to adapt to many kinds of systems.
+\`configure' configures yast2 2.15.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1254,7 +1254,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2 2.15.11:";;
+ short | recursive ) echo "Configuration of yast2 2.15.12:";;
esac
cat <<\_ACEOF
@@ -1332,7 +1332,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2 configure 2.15.11
+yast2 configure 2.15.12
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1346,7 +1346,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.15.11, which was
+It was created by yast2 $as_me 2.15.12, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2147,7 +2147,7 @@
# Define the identity of the package.
PACKAGE='yast2'
- VERSION='2.15.11'
+ VERSION='2.15.12'
cat >>confdefs.h <<_ACEOF
@@ -2374,7 +2374,7 @@
-VERSION="2.15.11"
+VERSION="2.15.12"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
@@ -3366,7 +3366,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.15.11, which was
+This file was extended by yast2 $as_me 2.15.12, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3409,7 +3409,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2 config.status 2.15.11
+yast2 config.status 2.15.12
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.11/configure.in new/yast2-2.15.12/configure.in
--- old/yast2-2.15.11/configure.in 2007-02-19 16:02:07.000000000 +0100
+++ new/yast2-2.15.12/configure.in 2007-02-23 13:02:11.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.15.11, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.15.12, http://bugs.opensuse.org/, yast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.11"
+VERSION="2.15.12"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.11/library/modules/Version.ycp new/yast2-2.15.12/library/modules/Version.ycp
--- old/yast2-2.15.11/library/modules/Version.ycp 2007-02-19 16:02:33.000000000 +0100
+++ new/yast2-2.15.12/library/modules/Version.ycp 2007-02-23 13:02:42.000000000 +0100
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.15.11";
+global string yast2 = "2.15.12";
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.11/library/network/src/SuSEFirewallServices.ycp new/yast2-2.15.12/library/network/src/SuSEFirewallServices.ycp
--- old/yast2-2.15.11/library/network/src/SuSEFirewallServices.ycp 2007-02-12 09:37:17.000000000 +0100
+++ new/yast2-2.15.12/library/network/src/SuSEFirewallServices.ycp 2007-02-23 10:10:55.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Definition of Supported Firewall Services and Port Aliases.
* Authors: Lukas Ocilka
*
- * $Id: SuSEFirewallServices.ycp 35972 2007-02-08 15:49:42Z locilka $
+ * $Id: SuSEFirewallServices.ycp 36307 2007-02-20 12:37:07Z locilka $
*
* Global Definition of Firewall Services
* Defined using TCP, UDP and RPC ports and IP protocols and Broadcast UDP
@@ -17,6 +17,16 @@
import "FileUtils";
+ //
+ //
+ // PLEASE, DO NOT ADD MORE SERVICES.
+ // ADD THE SERVICE DEFINITION TO THE PACKAGE TO WHICH IT BELONGS.
+ // USE /usr/share/SuSEfirewall2/services/TEMPLATE FOR THAT.
+ // MORE INFORMATION IN FEATURE #300687: Ports for SuSEfirewall added via packages.
+ // ANOTHER REFERENCE: Bugzilla #246911.
+ //
+ //
+
// FIXME: repair by implementing FATE #300687: Ports for SuSEfirewall added via packages.
// add definition of services to the respective package
/* list of possibly conflict services because of sharing ports, for instance: "nis-server" and "nfs-server" */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.11/library/packages/src/common.ycp new/yast2-2.15.12/library/packages/src/common.ycp
--- old/yast2-2.15.11/library/packages/src/common.ycp 2007-01-05 15:35:13.000000000 +0100
+++ new/yast2-2.15.12/library/packages/src/common.ycp 2007-02-23 13:01:32.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Martin Vidner
* Michal Svec
*
- * $Id: common.ycp 26523 2005-12-14 15:45:07Z mvidner $
+ * $Id: common.ycp 36445 2007-02-23 12:01:29Z lslezak $
*
* The documentation is maintained at
* <a href="../index.html">.../docs/index.html</a>.
@@ -33,24 +33,52 @@
/**
* Are all of these packages available?
* @param packages list of packages
- * @return boolean true if yes
+ * @return boolean true if yes (nil = an error occurred)
*/
global define boolean AvailableAll(list<string> packages) {
+ boolean error = false;
+
string which = find(string p, packages, {
- return ! Available(p);
+ boolean avail = Available(p);
+ if (avail == nil)
+ {
+ error = true;
+ }
+
+ return ! avail;
});
+
+ if (error)
+ {
+ return nil;
+ }
+
return which == nil;
}
/**
* Is any of these packages available?
* @param packages list of packages
- * @return boolean true if yes
+ * @return boolean true if yes (nil = an error occurred)
*/
global define boolean AvailableAny(list<string> packages) {
+ boolean error = false;
+
string which = find(string p, packages, {
- return Available(p);
+ boolean avail = Available(p);
+ if (avail == nil)
+ {
+ error = true;
+ }
+
+ return avail;
});
+
+ if (error)
+ {
+ return nil;
+ }
+
return which != nil;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.11/library/packages/src/PackageSystem.ycp new/yast2-2.15.12/library/packages/src/PackageSystem.ycp
--- old/yast2-2.15.11/library/packages/src/PackageSystem.ycp 2007-02-12 09:37:17.000000000 +0100
+++ new/yast2-2.15.12/library/packages/src/PackageSystem.ycp 2007-02-23 13:01:32.000000000 +0100
@@ -6,7 +6,7 @@
* Michal Svec
* Flags: Stable
*
- * $Id: PackageSystem.ycp 35608 2007-01-23 09:04:42Z jsrain $
+ * $Id: PackageSystem.ycp 36445 2007-02-23 12:01:29Z lslezak $
*
* The documentation is maintained at
* <a href="../index.html">.../docs/index.html</a>.
@@ -207,10 +207,17 @@
/**
* Is a package available?
- * @return true if yes
+ * @return true if yes (nil = no package source available)
*/
global boolean Available(string package) {
EnsureSourceInit();
+
+ if (!source_initialized)
+ {
+ // error no source initialized
+ return nil;
+ }
+
return Pkg::IsAvailable(package);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.11/VERSION new/yast2-2.15.12/VERSION
--- old/yast2-2.15.11/VERSION 2007-02-19 16:00:19.000000000 +0100
+++ new/yast2-2.15.12/VERSION 2007-02-23 12:54:41.000000000 +0100
@@ -1 +1 @@
-2.15.11
+2.15.12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org