Hello community,
here is the log from the commit of package yast2
checked in at Mon May 5 01:15:06 CEST 2008.
--------
--- yast2/yast2.changes 2008-04-29 17:08:19.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2008-05-02 14:56:33.411161000 +0200
@@ -1,0 +2,13 @@
+Fri May 2 14:07:24 CEST 2008 - lslezak@suse.cz
+
+- Mode::test(), PakageCallbacks - do not call UI:: functions in
+ command line mode (do not initialize UI) (another fix for
+ bnc#374259)
+- 2.16.61
+
+-------------------------------------------------------------------
+Wed Apr 30 12:02:38 CEST 2008 - lslezak@suse.cz
+
+- Product.ycp - properly set 'name' and 'short_name' (bnc#368104)
+
+-------------------------------------------------------------------
Old:
----
yast2-2.16.60.tar.bz2
New:
----
yast2-2.16.61.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.Ba5704/_old 2008-05-05 01:14:54.000000000 +0200
+++ /var/tmp/diff_new_pack.Ba5704/_new 2008-05-05 01:14:54.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.16.60)
+# spec file for package yast2 (Version 2.16.61)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2
-Version: 2.16.60
+Version: 2.16.61
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.16.60.tar.bz2
+Source0: yast2-2.16.61.tar.bz2
Prefix: /usr
Source1: yast2-rpmlintrc
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite
@@ -138,7 +138,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.16.60
+%setup -n yast2-2.16.61
%build
%{prefix}/bin/y2tool y2autoconf
@@ -242,6 +242,13 @@
%doc %{prefix}/share/doc/packages/yast2/types
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog
+* Fri May 02 2008 lslezak@suse.cz
+- Mode::test(), PakageCallbacks - do not call UI:: functions in
+ command line mode (do not initialize UI) (another fix for
+ bnc#374259)
+- 2.16.61
+* Wed Apr 30 2008 lslezak@suse.cz
+- Product.ycp - properly set 'name' and 'short_name' (bnc#368104)
* Tue Apr 29 2008 lslezak@suse.cz
- moved ag_content agent (.content_file path) from yast2-instserver
package here so it can be shared by yast2-instserver and
++++++ yast2-2.16.60.tar.bz2 -> yast2-2.16.61.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.60/configure new/yast2-2.16.61/configure
--- old/yast2-2.16.60/configure 2008-04-29 17:07:13.000000000 +0200
+++ new/yast2-2.16.61/configure 2008-05-02 14:55:51.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2 2.16.60.
+# Generated by GNU Autoconf 2.61 for yast2 2.16.61.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2'
PACKAGE_TARNAME='yast2'
-PACKAGE_VERSION='2.16.60'
-PACKAGE_STRING='yast2 2.16.60'
+PACKAGE_VERSION='2.16.61'
+PACKAGE_STRING='yast2 2.16.61'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1199,7 +1199,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.16.60 to adapt to many kinds of systems.
+\`configure' configures yast2 2.16.61 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1270,7 +1270,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2 2.16.60:";;
+ short | recursive ) echo "Configuration of yast2 2.16.61:";;
esac
cat <<\_ACEOF
@@ -1348,7 +1348,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2 configure 2.16.60
+yast2 configure 2.16.61
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1362,7 +1362,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.16.60, which was
+It was created by yast2 $as_me 2.16.61, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2183,7 +2183,7 @@
# Define the identity of the package.
PACKAGE='yast2'
- VERSION='2.16.60'
+ VERSION='2.16.61'
cat >>confdefs.h <<_ACEOF
@@ -2411,7 +2411,7 @@
-VERSION="2.16.60"
+VERSION="2.16.61"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
@@ -3412,7 +3412,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.16.60, which was
+This file was extended by yast2 $as_me 2.16.61, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3455,7 +3455,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2 config.status 2.16.60
+yast2 config.status 2.16.61
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.60/configure.in new/yast2-2.16.61/configure.in
--- old/yast2-2.16.60/configure.in 2008-04-29 17:07:09.000000000 +0200
+++ new/yast2-2.16.61/configure.in 2008-05-02 14:55:46.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.16.60, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.16.61, 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.16.60"
+VERSION="2.16.61"
RPMNAME="yast2"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.60/library/modules/Mode.ycp new/yast2-2.16.61/library/modules/Mode.ycp
--- old/yast2-2.16.60/library/modules/Mode.ycp 2008-02-15 13:02:53.000000000 +0100
+++ new/yast2-2.16.61/library/modules/Mode.ycp 2008-05-02 14:55:32.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Klaus Kaempf
* Flags: Stable
*
- * $Id: Mode.ycp 44098 2008-02-01 12:12:49Z locilka $
+ * $Id: Mode.ycp 47249 2008-05-02 12:55:31Z lslezak $
*
* Provide installation mode information.
* Mostly values from /etc/install.inf
@@ -124,14 +124,21 @@
_mode = new_mode;
}
+global boolean commandline();
+
// test mode definitions
global string testMode () {
if (_test == nil)
Initialize ();
if (!test_autochecked) {
- // #243624
- if (UI::GetDisplayInfo () == nil) {
+
+ // do not call GetDisplayInfo in command line mode (bnc#374259)
+ if (commandline())
+ {
+ _test = "none";
+ }
+ else if (UI::GetDisplayInfo () == nil) {
_test = "testsuite"; // testsuite runs with a dummy ui.
}
test_autochecked = true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.60/library/modules/Version.ycp new/yast2-2.16.61/library/modules/Version.ycp
--- old/yast2-2.16.60/library/modules/Version.ycp 2008-04-29 17:07:22.000000000 +0200
+++ new/yast2-2.16.61/library/modules/Version.ycp 2008-05-02 14:56:00.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.16.60";
+global string yast2 = "2.16.61";
/* EOF */
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.60/library/packages/src/PackageCallbacks.ycp new/yast2-2.16.61/library/packages/src/PackageCallbacks.ycp
--- old/yast2-2.16.60/library/packages/src/PackageCallbacks.ycp 2008-04-28 15:41:10.000000000 +0200
+++ new/yast2-2.16.61/library/packages/src/PackageCallbacks.ycp 2008-05-02 14:55:32.000000000 +0200
@@ -7,7 +7,7 @@
*
* Purpose: provides the default Callbacks for Pkg::
*
- * $Id: PackageCallbacks.ycp 47114 2008-04-28 13:41:10Z lslezak $
+ * $Id: PackageCallbacks.ycp 47249 2008-05-02 12:55:31Z lslezak $
*
*/
@@ -63,12 +63,12 @@
boolean textmode()
{
- return UI::GetDisplayInfo()["TextMode"]:false;
+ return Mode::commandline() ? true : UI::GetDisplayInfo()["TextMode"]:false;
}
integer display_width()
{
- return UI::GetDisplayInfo()["Width"]:0;
+ return Mode::commandline() ? 0 : UI::GetDisplayInfo()["Width"]:0;
}
/* Location of the persistent storage */
@@ -2579,6 +2579,8 @@
y2milestone("Process: Start: task: %1, stages: %2, help: %3", task, stages, help);
y2milestone("Progress: status: %1, isrunning: %2", Progress::status(), Progress::IsRunning());
+ if (Mode::commandline()) return;
+
boolean opened = false;
if (Progress::status())
@@ -2609,6 +2611,9 @@
global boolean ProcessProgress(integer percent)
{
y2debug("Process: %1%%", percent);
+
+ if (Mode::commandline()) return true;
+
Progress::Step(percent);
return true;
@@ -2620,6 +2625,9 @@
global void ProcessNextStage()
{
y2milestone("Setting stage: %1", last_stage);
+
+ if (Mode::commandline()) return;
+
Progress::Stage(last_stage, "", -1);
last_stage = last_stage + 1;
@@ -2631,6 +2639,7 @@
global void ProcessDone()
{
y2milestone("Process: Finished");
+ if (Mode::commandline()) return;
integer idx = size(opened_wizard) - 1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.60/library/packages/src/Product.ycp new/yast2-2.16.61/library/packages/src/Product.ycp
--- old/yast2-2.16.60/library/packages/src/Product.ycp 2008-04-23 13:19:48.000000000 +0200
+++ new/yast2-2.16.61/library/packages/src/Product.ycp 2008-04-30 12:03:41.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Klaus Kaempf
* Lukas Ocilka
*
- * $Id: Product.ycp 46978 2008-04-23 11:19:48Z lslezak $
+ * $Id: Product.ycp 47204 2008-04-30 10:03:40Z lslezak $
*/
{
@@ -121,9 +121,9 @@
}
else if (!Mode::config ())
{
- name = SuSERelease::ReleaseName();
- short_name = name;
+ short_name = SuSERelease::ReleaseName();
version = SuSERelease::ReleaseVersion();
+ name = short_name + " " + version;
}
if(distproduct == nil) distproduct = "";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.60/library/wizard/src/Progress.ycp new/yast2-2.16.61/library/wizard/src/Progress.ycp
--- old/yast2-2.16.60/library/wizard/src/Progress.ycp 2008-04-10 16:07:26.000000000 +0200
+++ new/yast2-2.16.61/library/wizard/src/Progress.ycp 2008-05-02 14:55:32.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Progress bar
* Authors: Petr Blahos
*
- * $Id: Progress.ycp 46310 2008-04-09 15:43:12Z kmachalkova $
+ * $Id: Progress.ycp 47249 2008-05-02 12:55:31Z lslezak $
*
* Functions for progress bar.<br>
* <pre>
@@ -371,11 +371,6 @@
y2milestone("Progress::New(%1, %2, %3)", window_title, length, stg);
- // a progress is already running, remember the current status
- if (IsRunning())
- {
- PushState();
- }
integer orig_current_step = current_step;
@@ -388,6 +383,12 @@
if (Mode::commandline ())
return;
+ // a progress is already running, remember the current status
+ if (IsRunning())
+ {
+ PushState();
+ }
+
if (length < size(stg))
{
y2warning("Number of stages (%1) is greater than number of steps (%2)", size(stg), length);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.16.60/VERSION new/yast2-2.16.61/VERSION
--- old/yast2-2.16.60/VERSION 2008-04-29 15:18:42.000000000 +0200
+++ new/yast2-2.16.61/VERSION 2008-05-02 14:55:02.000000000 +0200
@@ -1 +1 @@
-2.16.60
+2.16.61
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org