Hello community,
here is the log from the commit of package yast2
checked in at Fri Sep 12 01:53:24 CEST 2008.
--------
--- yast2/yast2.changes 2008-09-09 15:30:20.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2008-09-10 07:38:15.275800000 +0200
@@ -1,0 +2,12 @@
+Wed Sep 10 07:24:35 CEST 2008 - lslezak@suse.cz
+
+- fixed UI definition in MediaChange callback (incorrectly defined
+ ButtonBox widget) (bnc#424349)
+- 2.17.21
+
+-------------------------------------------------------------------
+Tue Sep 9 15:38:57 CEST 2008 - locilka@suse.cz
+
+- .barexml SCR agent dropped (bnc #424263).
+
+-------------------------------------------------------------------
Old:
----
yast2-2.17.20.tar.bz2
New:
----
yast2-2.17.21.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.o22143/_old 2008-09-12 01:52:59.000000000 +0200
+++ /var/tmp/diff_new_pack.o22143/_new 2008-09-12 01:52:59.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.17.20)
+# spec file for package yast2 (Version 2.17.21)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2
-Version: 2.17.20
+Version: 2.17.21
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.17.20.tar.bz2
+Source0: yast2-2.17.21.tar.bz2
Prefix: /usr
Source1: yast2-rpmlintrc
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite
@@ -48,8 +48,6 @@
Requires: yast2-xml yast2-hardware-detection
# for SLPAPI.pm
Requires: yast2-perl-bindings
-# for ag_barexml
-Requires: perl-XML-Bare
# for ag_anyxml
Requires: perl-XML-Simple
# moved cfg_security.scr
@@ -149,7 +147,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.17.20
+%setup -n yast2-2.17.21
%build
%{prefix}/bin/y2tool y2autoconf
@@ -254,6 +252,12 @@
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog
+* Wed Sep 10 2008 lslezak@suse.cz
+- fixed UI definition in MediaChange callback (incorrectly defined
+ ButtonBox widget) (bnc#424349)
+- 2.17.21
+* Tue Sep 09 2008 locilka@suse.cz
+- .barexml SCR agent dropped (bnc #424263).
* Tue Sep 09 2008 mzugec@suse.de
- fixed NetworkInterfaces::FreeDevice() function
- 2.17.20
++++++ yast2-2.17.20.tar.bz2 -> yast2-2.17.21.tar.bz2 ++++++
++++ 4036 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.17.20/configure.in new/yast2-2.17.21/configure.in
--- old/yast2-2.17.20/configure.in 2008-08-22 11:32:17.000000000 +0200
+++ new/yast2-2.17.21/configure.in 2008-09-10 07:31:39.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2
dnl
-dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.17.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.17.19, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.17.21, 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.17.19"
+VERSION="2.17.21"
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.17.20/library/agents/ag_barexml new/yast2-2.17.21/library/agents/ag_barexml
--- old/yast2-2.17.20/library/agents/ag_barexml 2008-08-12 13:40:28.000000000 +0200
+++ new/yast2-2.17.21/library/agents/ag_barexml 1970-01-01 01:00:00.000000000 +0100
@@ -1,49 +0,0 @@
-#!/usr/bin/perl -w
-
-#
-# Name: ag_barexml
-# Authors: Lukas Ocilka
-# Summary: Agent for parsing any XML files using XML::Bare.
-# Please, make sure it fits your needs before using it.
-# XML::Bare is a bit buggy when handling comments.
-#
-
-use strict;
-use lib "/usr/lib/YaST2/agents_non_y2";
-use ycp;
-use XML::Bare;
-
-while (<STDIN>) {
- my ($command, $path, $file) = ycp::ParseCommand ($_);
-
- if ($command eq "Read") {
- if (! defined $file || $file eq "") {
- y2error ("No file defined!");
- ycp::Return (undef);
- next;
- } elsif (! -e $file) {
- y2error ("File ".$file." doesn't exist!");
- ycp::Return (undef);
- next;
- }
-
- y2milestone ("Reading: '".$file."'");
- open (FILE, $file) || do {
- y2error ("Cannot open file ".$file.": ".$!);
- next;
- };
- my @lines = <FILE>;
- close FILE;
-
- my $xml = new XML::Bare ('text' => join ('', @lines));
- my $root = $xml->parse();
- undef $xml;
-
- ycp::Return ($root);
- } elsif ($command eq "result") {
- exit 0;
- } else {
- my $return_value = sprintf( "Unknown instruction %s", $command);
- ycp::Return ($return_value);
- }
-}
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.17.20/library/agents/barexml.scr new/yast2-2.17.21/library/agents/barexml.scr
--- old/yast2-2.17.20/library/agents/barexml.scr 2008-08-12 13:40:28.000000000 +0200
+++ new/yast2-2.17.21/library/agents/barexml.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-/**
- * File: barexml.scr
- *
- * Summary: Agent for reading any XML files.
- * It's buggy in case of comments in the XML file.
- *
- * Authors: Lukas Ocilka
- *
- * Example: SCR::Read (.barexml, "/root/some_file.xml")
- *
- * $Id:$
- */
-
-.barexml
-
-`ag_barexml ()
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.17.20/library/agents/Makefile.am new/yast2-2.17.21/library/agents/Makefile.am
--- old/yast2-2.17.20/library/agents/Makefile.am 2008-08-12 13:40:28.000000000 +0200
+++ new/yast2-2.17.21/library/agents/Makefile.am 2008-09-09 16:39:00.000000000 +0200
@@ -1,10 +1,9 @@
# Makefile.am for yast2/library/agents
-# $Id: Makefile.am 47169 2008-04-29 15:06:36Z lslezak $
+# $Id: Makefile.am 50907 2008-09-09 13:47:41Z locilka $
agent_SCRIPTS = \
ag_content \
ag_netd \
- ag_anyxml \
- ag_barexml
+ ag_anyxml
scrconf_DATA = $(wildcard *.scr)
EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA)
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.17.20/library/modules/Version.ycp new/yast2-2.17.21/library/modules/Version.ycp
--- old/yast2-2.17.20/library/modules/Version.ycp 2008-09-09 15:27:14.000000000 +0200
+++ new/yast2-2.17.21/library/modules/Version.ycp 2008-09-10 07:31:56.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.17.20";
+global string yast2 = "2.17.21";
/* 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.17.20/library/packages/src/PackageCallbacks.ycp new/yast2-2.17.21/library/packages/src/PackageCallbacks.ycp
--- old/yast2-2.17.20/library/packages/src/PackageCallbacks.ycp 2008-08-21 11:49:46.000000000 +0200
+++ new/yast2-2.17.21/library/packages/src/PackageCallbacks.ycp 2008-09-10 07:31:19.000000000 +0200
@@ -7,7 +7,7 @@
*
* Purpose: provides the default Callbacks for Pkg::
*
- * $Id: PackageCallbacks.ycp 50438 2008-08-28 11:27:45Z locilka $
+ * $Id: PackageCallbacks.ycp 50919 2008-09-10 05:31:18Z lslezak $
*
*/
@@ -581,7 +581,7 @@
else {
term button_box = `ButtonBox (
`PushButton (`id(`abort), `opt (`cancelButton), Label::AbortButton()),
- `PushButton (`id(`retry), `opt (`commonButton), Label::RetryButton()),
+ `PushButton (`id(`retry), `opt (`customButton), Label::RetryButton()),
`PushButton (`id(`ignore), `opt (`okButton), Label::IgnoreButton())
);
@@ -792,18 +792,18 @@
// --------------------------------------
// build up button box
- term button_box = `ButtonBox (`PushButton (`id(`retry), `opt(`default, `commonButton), Label::RetryButton()));
+ term button_box = `ButtonBox (`PushButton (`id(`retry), `opt(`default, `okButton), Label::RetryButton()));
if (current == -1) // wrong media id, offer "Ignore"
{
- button_box = add (button_box, `PushButton(`id(`ignore), `opt (`okButton), Label::IgnoreButton()));
+ button_box = add (button_box, `PushButton(`id(`ignore), `opt (`customButton), Label::IgnoreButton()));
}
button_box = add (button_box, `PushButton (`id(`cancel), `opt (`cancelButton), Label::AbortButton()));
// push button label during media change popup, user can skip
// this media (CD) so no packages from this media will be installed
- button_box = add (button_box, `PushButton (`id(`skip), `opt(`commonButton), _("&Skip")));
+ button_box = add (button_box, `PushButton (`id(`skip), `opt(`customButton), _("&Skip")));
if (offer_eject_button)
{
@@ -817,14 +817,17 @@
list<term> cds = detected_cd_devices;
// display a menu button if there are more CD devices
- term eject_button =
- (size(cds) > 1) ?
- // menu button label - used for more then one device
- `MenuButton(_("&Eject"), cds)
- // push button label - in the media change popup, user can eject the CD/DVD
- : `PushButton (`id(`eject), _("&Eject"));
+ if (size(cds) > 1)
+ {
+ // menu button label - used for more then one device
+ button_box = `HBox(button_box, `MenuButton(_("&Eject"), cds));
+ }
+ else
+ {
+ // push button label - in the media change popup, user can eject the CD/DVD
+ button_box = add(button_box, `PushButton (`id(`eject), `opt(`customButton), _("&Eject")));
+ }
- button_box = add(button_box, eject_button);
boolean auto_eject = (boolean)GetConfig("automatic_eject");
if (auto_eject == nil)
@@ -908,6 +911,8 @@
return "S";
}
+ y2internal("Opening Dialog: %1", LayoutPopup (message, button_box, 10, true));
+
if ( showLongInfo )
{
UI::OpenDialog( `opt(`decorated), LayoutPopup (message, button_box, 10, true) );
@@ -1820,7 +1825,7 @@
might be missing or out of date.")),
`ButtonBox (
`PushButton (`id(`continue), `opt (`default, `okButton), Label::ContinueButton()),
- `PushButton (`id(`skip), `opt (`commonButton), _("Skip Refresh"))
+ `PushButton (`id(`skip), `opt (`customButton), _("Skip Refresh"))
)
)
)
@@ -2326,7 +2331,7 @@
term button_box = `ButtonBox
(
`PushButton (`id (`abort), `opt (`cancelButton), Label::AbortButton()),
- `PushButton (`id (`retry), `opt (`commonButton), Label::RetryButton()),
+ `PushButton (`id (`retry), `opt (`customButton), Label::RetryButton()),
`PushButton (`id (`ignore), `opt (`okButton), Label::IgnoreButton())
);
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.17.20/VERSION new/yast2-2.17.21/VERSION
--- old/yast2-2.17.20/VERSION 2008-08-22 11:36:57.000000000 +0200
+++ new/yast2-2.17.21/VERSION 2008-09-10 07:24:16.000000000 +0200
@@ -1 +1 @@
-2.17.20
+2.17.21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org