Hello community,
here is the log from the commit of package yast2
checked in at Mon Sep 3 18:47:42 CEST 2007.
--------
--- yast2/yast2.changes 2007-08-31 10:49:33.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2007-09-03 14:25:25.000000000 +0200
@@ -1,0 +2,28 @@
+Mon Sep 3 14:25:19 CEST 2007 - mvidner@suse.cz
+
+- Mail via AutoYaST: do not omit the colon separator in /etc/aliases;
+ fixed warnings about undefined variables (#304190).
+- 2.15.54
+
+-------------------------------------------------------------------
+Mon Sep 3 13:08:17 CEST 2007 - lslezak@suse.cz
+
+- added fallback for "kernel-iseries64" - use "kernel-ppc64",
+ when it's not available (#302246)
+- properly check whether a kernel package is available (use package
+ name instead of 'provides' capability), fixed check in 'repair'
+ mode (#302246, #299683)
+- added Package::PackageAvailable() and Package::PackageInstaled()
+ functions to check whether a package is available or installed
+ (they check package name in contrast to Package::IsAvailable()
+ and Package::IsInstalled() which check 'provides' capability)
+- 2.15.53
+
+-------------------------------------------------------------------
+Mon Sep 3 08:24:32 CEST 2007 - mvidner@suse.cz
+
+- Use xmessage only if y2base fails. Don't use it for harmless
+ warnings (#265263#c59).
+- 2.15.52
+
+-------------------------------------------------------------------
Old:
----
yast2-2.15.51.tar.bz2
New:
----
yast2-2.15.54.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.tA7260/_old 2007-09-03 18:45:55.000000000 +0200
+++ /var/tmp/diff_new_pack.tA7260/_new 2007-09-03 18:45:55.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.15.51)
+# spec file for package yast2 (Version 2.15.54)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,19 +11,19 @@
# norootforbuild
Name: yast2
-Version: 2.15.51
+Version: 2.15.54
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.15.51.tar.bz2
+Source0: yast2-2.15.54.tar.bz2
prefix: /usr
Source1: yast2-rpmlintrc
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-pkg-bindings yast2-testsuite
# SCR::RegisterNewAgents()
Requires: yast2-core >= 2.15.4
-# Pkg::CallbackInitDownload()
-Requires: yast2-pkg-bindings >= 2.15.39
+# Pkg::PkgAvailable() and Pkg::PkgInstalled()
+Requires: yast2-pkg-bindings >= 2.15.47
Requires: yast2_ui yast2_theme
# For Cron Agent, Module
Requires: perl-Config-Crontab
@@ -109,7 +109,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.15.51
+%setup -n yast2-2.15.54
%build
%{prefix}/bin/y2tool y2autoconf
@@ -214,6 +214,25 @@
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog
+* Mon Sep 03 2007 - mvidner@suse.cz
+- Mail via AutoYaST: do not omit the colon separator in /etc/aliases;
+ fixed warnings about undefined variables (#304190).
+- 2.15.54
+* Mon Sep 03 2007 - lslezak@suse.cz
+- added fallback for "kernel-iseries64" - use "kernel-ppc64",
+ when it's not available (#302246)
+- properly check whether a kernel package is available (use package
+ name instead of 'provides' capability), fixed check in 'repair'
+ mode (#302246, #299683)
+- added Package::PackageAvailable() and Package::PackageInstaled()
+ functions to check whether a package is available or installed
+ (they check package name in contrast to Package::IsAvailable()
+ and Package::IsInstalled() which check 'provides' capability)
+- 2.15.53
+* Mon Sep 03 2007 - mvidner@suse.cz
+- Use xmessage only if y2base fails. Don't use it for harmless
+ warnings (#265263#c59).
+- 2.15.52
* Fri Aug 31 2007 - locilka@suse.cz
- Fixing evaluation of unreadable cpuflags in Kernel.ycp (#303842).
- 2.15.51
++++++ yast2-2.15.51.tar.bz2 -> yast2-2.15.54.tar.bz2 ++++++
++++ 3882 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.15.51/configure.in new/yast2-2.15.54/configure.in
--- old/yast2-2.15.51/configure.in 2007-08-31 10:55:21.000000000 +0200
+++ new/yast2-2.15.54/configure.in 2007-09-03 14:29:09.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2
dnl
-dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.8 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.15.51, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.15.54, 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.51"
+VERSION="2.15.54"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.15.51/library/modules/MailTableInclude.pm new/yast2-2.15.54/library/modules/MailTableInclude.pm
--- old/yast2-2.15.51/library/modules/MailTableInclude.pm 2007-05-18 10:43:13.000000000 +0200
+++ new/yast2-2.15.54/library/modules/MailTableInclude.pm 2007-09-03 14:21:46.000000000 +0200
@@ -36,8 +36,8 @@
my $line = "";
my $backslashed_line;
-my $separator;
-my $oseparator;
+my $separator = $colon ? qr/:\s+/ : qr/\s+/;
+my $oseparator = $colon ? ":\t" : "\t";
my $debug = defined($ARGV[0]) && $ARGV[0] eq "-d";
@@ -182,7 +182,7 @@
sub write_comment ($)
{
my $comment = shift;
- foreach my $line (split /\n/, $comment)
+ foreach my $line (split /\n/, $comment || "")
{
print FILE "\#$line\n";
}
@@ -208,7 +208,7 @@
if (-f $filename)
{
- rename $filename, "$filename.YaST2.save" or return log_error ("Creating backup: $!");
+ rename $filename, "$filename.YaST2save" or return log_error ("Creating backup: $!");
}
rename "$filename.YaST2.new", $filename or return log_error ("Moving temp file: $!");
@@ -220,9 +220,6 @@
sub Read ()
{
- $separator = $colon ? qr/:\s+/ : qr/\s+/;
- $oseparator = $colon ? ":\t" : "\t";
-
parse_file ();
$modified = 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.15.51/library/modules/Version.ycp new/yast2-2.15.54/library/modules/Version.ycp
--- old/yast2-2.15.51/library/modules/Version.ycp 2007-08-31 10:55:41.000000000 +0200
+++ new/yast2-2.15.54/library/modules/Version.ycp 2007-09-03 14:30:03.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.15.51";
+global string yast2 = "2.15.54";
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.15.51/library/packages/src/PackageAI.ycp new/yast2-2.15.54/library/packages/src/PackageAI.ycp
--- old/yast2-2.15.51/library/packages/src/PackageAI.ycp 2007-05-18 10:43:13.000000000 +0200
+++ new/yast2-2.15.54/library/packages/src/PackageAI.ycp 2007-09-03 14:21:47.000000000 +0200
@@ -6,7 +6,7 @@
* Michal Svec
* Flags: Stable
*
- * $Id: PackageAI.ycp 31242 2006-06-01 12:59:16Z locilka $
+ * $Id: PackageAI.ycp 40693 2007-09-03 11:24:29Z lslezak $
*/
{
@@ -73,6 +73,24 @@
return contains(toinstall, package);
}
+/**
+ * Is a package installed? Checks only the package name in contrast to Installed() function.
+ * @return true if yes
+ */
+global boolean PackageInstalled(string package) {
+ return Installed(package);
+}
+
+/**
+ * Is a package available? Checks only package name, not list of provides.
+ * @return true if yes
+ */
+global boolean PackageAvailable(string package)
+{
+ return Available(package);
+}
+
+
global boolean InstallKernel (list<string> kernel_modules) {
// TODO: for 9.2, we always install all packages, but
// we could only install those really needed (#44394)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.15.51/library/packages/src/PackageSystem.ycp new/yast2-2.15.54/library/packages/src/PackageSystem.ycp
--- old/yast2-2.15.51/library/packages/src/PackageSystem.ycp 2007-06-11 10:21:35.000000000 +0200
+++ new/yast2-2.15.54/library/packages/src/PackageSystem.ycp 2007-09-03 14:21:47.000000000 +0200
@@ -6,7 +6,7 @@
* Michal Svec
* Flags: Stable
*
- * $Id: PackageSystem.ycp 38335 2007-06-07 10:46:58Z lslezak $
+ * $Id: PackageSystem.ycp 40693 2007-09-03 11:24:29Z lslezak $
*
* The documentation is maintained at
* <a href="../index.html">.../docs/index.html</a>.
@@ -257,7 +257,7 @@
}
/**
- * Is a package installed?
+ * Is a package provided in the system? Is there any installed package providing 'package'?
* @return true if yes
*/
global boolean Installed(string package) {
@@ -272,6 +272,35 @@
}
/**
+ * Is a package installed? Checks only the package name in contrast to Installed() function.
+ * @return true if yes
+ */
+global boolean PackageInstalled(string package) {
+ // This is commonly called function and so it's
+ // important that it's fast, especially in the common
+ // case, where all dependencies are satisfied.
+ // Unfortunately, initializing Pkg reads the RPM database...
+ // so we must avoid it.
+ return 0 == (integer) SCR::Execute(.target.bash, "rpm -q " + package);
+}
+
+/**
+ * Is a package available? Checks only package name, not list of provides.
+ * @return true if yes (nil = no package source available)
+ */
+global boolean PackageAvailable(string package) {
+ EnsureSourceInit();
+
+ if (!source_initialized)
+ {
+ // error no source initialized
+ return nil;
+ }
+
+ return Pkg::PkgAvailable(package);
+}
+
+/**
* @short Check if packages are installed
* @descr Install them if they are not and user approves installation
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.15.51/library/packages/src/Package.ycp new/yast2-2.15.54/library/packages/src/Package.ycp
--- old/yast2-2.15.51/library/packages/src/Package.ycp 2007-05-18 10:43:13.000000000 +0200
+++ new/yast2-2.15.54/library/packages/src/Package.ycp 2007-09-03 14:21:47.000000000 +0200
@@ -6,7 +6,7 @@
* Michal Svec
* Flags: Stable
*
- * $Id: Package.ycp 31242 2006-06-01 12:59:16Z locilka $
+ * $Id: Package.ycp 40693 2007-09-03 11:24:29Z lslezak $
*
* The documentation is maintained at
* <a href="../index.html">.../docs/index.html</a>.
@@ -32,6 +32,8 @@
"Available" : PackageSystem::Available,
"Installed" : PackageSystem::Installed,
"InstallKernel" : PackageSystem::InstallKernel,
+ "PackageInstalled" : PackageSystem::PackageInstalled,
+ "PackageAvailable" : PackageSystem::PackageAvailable,
];
map FunctionsAI = $[
@@ -41,6 +43,8 @@
"Available" : PackageAI::Available,
"Installed" : PackageAI::Installed,
"InstallKernel" : PackageAI::InstallKernel,
+ "PackageInstalled" : PackageAI::PackageInstalled,
+ "PackageAvailable" : PackageAI::PackageAvailable,
];
map Functions = Mode::config () ? FunctionsAI : FunctionsSystem;
@@ -90,6 +94,16 @@
return function(package);
}
+global boolean PackageAvailable(string package) {
+ boolean (string) function = (boolean (string)) (Functions["PackageAvailable"]:nil);
+ return function(package);
+}
+
+global boolean PackageInstalled(string package) {
+ boolean (string) function = (boolean (string)) (Functions["PackageInstalled"]:nil);
+ return function(package);
+}
+
global boolean InstallKernel (list<string> kernel_modules) {
boolean (list<string>) function = (boolean (list<string>)) (Functions["InstallKernel"]:nil);
return function(kernel_modules);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.15.51/library/system/src/Kernel.ycp new/yast2-2.15.54/library/system/src/Kernel.ycp
--- old/yast2-2.15.51/library/system/src/Kernel.ycp 2007-08-31 10:49:47.000000000 +0200
+++ new/yast2-2.15.54/library/system/src/Kernel.ycp 2007-09-03 14:21:46.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Klaus Kaempf
* Arvin Schnell
*
- * $Id: Kernel.ycp 40638 2007-08-31 08:49:47Z locilka $
+ * $Id: Kernel.ycp 40693 2007-09-03 11:24:29Z lslezak $
*
* <ul>
* <li>determine kernel rpm</li>
@@ -90,7 +90,9 @@
* fallback map for kernel
*/
map fallbacks = $[
- "kernel-bigsmp" : "kernel-default"
+ "kernel-bigsmp" : "kernel-default",
+ // fallback for PPC (#302246)
+ "kernel-iseries64" : "kernel-ppc64"
];
void ParseInstallationKernelCmdline ();
@@ -394,7 +396,7 @@
// install bigsmp kernel regardless the memory size - fate #159006
if (/*memsize >= fourGB &&*/ contains (cpuflags, "pae"))
{
- y2milestone ("Kernel switch: mem >= 4GB && PAE");
+ y2milestone ("Kernel switch: PAE detected");
kernel_packages = ["kernel-bigsmp"];
// add PV drivers
@@ -504,9 +506,9 @@
y2milestone ("Selecting '%1' as kernel package", the_kernel);
// Check for provided kernel packages in installed system
- if (Mode::normal ())
+ if (Mode::normal () || Mode::repair())
{
- while (the_kernel != "" && !Pkg::IsProvided (the_kernel))
+ while (the_kernel != "" && !Pkg::PkgInstalled(the_kernel))
{
the_kernel = fallbacks[the_kernel]:"";
y2milestone ("Not provided, falling back to '%1'", the_kernel);
@@ -516,7 +518,7 @@
// Check for available kernel packages during installation (instsys)
else
{
- while (the_kernel != "" && !Pkg::IsAvailable (the_kernel))
+ while (the_kernel != "" && !Pkg::PkgAvailable(the_kernel))
{
the_kernel = fallbacks[the_kernel]:"";
y2milestone ("Not available, falling back to '%1'", the_kernel);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.15.51/Makefile.am new/yast2-2.15.54/Makefile.am
--- old/yast2-2.15.51/Makefile.am 2007-08-31 10:55:21.000000000 +0200
+++ new/yast2-2.15.54/Makefile.am 2007-09-03 14:29:10.000000000 +0200
@@ -30,7 +30,7 @@
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
-AUTOMAKE_OPTIONS = foreign dist-bzip2
+AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.15.51/scripts/yast2 new/yast2-2.15.54/scripts/yast2
--- old/yast2-2.15.51/scripts/yast2 2007-08-30 12:27:01.000000000 +0200
+++ new/yast2-2.15.54/scripts/yast2 2007-09-03 08:24:56.000000000 +0200
@@ -17,27 +17,28 @@
# load common script functions
. /usr/lib/YaST2/bin/yast2-funcs
-# redirect to $@ if the input is not empty, #265263
-redir_nonempty()
-{
- local IFS='' L
- read L || return
- exec &> >("$@")
- echo "$L"
- cat
-}
-# #211392
+# #211392, #265263
# if we are in X and do not have _input_ from terminal,
-# make it output to xmessage
+# save the output and display it via xmessage in case of error.
+# TODO: also use bug-buddy or the kde thing... (#265263#c48)
redirect()
{
if [ -n "$DISPLAY" -a ! -t 0 ]; then
- XMESSAGE=`type -p xmessage`
- if [ -n "$XMESSAGE" ]; then
- exec &> >(redir_nonempty $XMESSAGE -buttons OK:0 -default OK -center -file -)
- fi
+ ERRLOG=`mktemp -t yast2-err-XXXXXX`
+ trap exit_trap EXIT
+ exec &> $ERRLOG
+ fi
+}
+
+exit_trap()
+{
+ # handily, exit_code is set to $? of y2base.
+ # If there was an error and there is anything to display, pop up.
+ if [ $exit_code != 0 -a -s $ERRLOG ]; then
+ xmessage -buttons OK:0 -default OK -center -file $ERRLOG
fi
+ rm -f $ERRLOG
}
# redirect the output if necessary
redirect
@@ -324,8 +325,9 @@
/usr/bin/test -x /bin/unicode_stop && /bin/unicode_stop
fi
else
- echo "You need to install yast2-ncurses to use the YaST2 text mode interface" >&2
- exit 1
+ rpm -V yast2-core yast2-ncurses yast2-qt yast2-gtk >&2
+ echo "Something is wrong with the YaST user interface." >&2
+ exit_code=1
fi
# quick hack: treat gtk like qt
elif [ "$SELECTED_GUI" = "qt" -o "$SELECTED_GUI" = "gtk" ]; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.15.51/VERSION new/yast2-2.15.54/VERSION
--- old/yast2-2.15.51/VERSION 2007-08-31 10:49:38.000000000 +0200
+++ new/yast2-2.15.54/VERSION 2007-09-03 14:23:30.000000000 +0200
@@ -1 +1 @@
-2.15.51
+2.15.54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org