Hello community,
here is the log from the commit of package yast2-installation
checked in at Thu Sep 7 01:04:19 CEST 2006.
--------
--- yast2-installation/yast2-installation.changes 2006-09-04 16:03:02.000000000 +0200
+++ yast2-installation/yast2-installation.changes 2006-09-06 17:59:56.000000000 +0200
@@ -1,0 +2,20 @@
+Wed Sep 6 17:41:07 CEST 2006 - mvidner@suse.cz
+
+- To allow adding unsigned sources, temporarily "rug set-pref
+ security-level none" when syncing in inst_source (#190403).
+- 2.13.149
+
+-------------------------------------------------------------------
+Wed Sep 6 12:47:51 CEST 2006 - locilka@suse.cz
+
+- No such headline "Mode" in the Installation Settings dialog.
+ Help fixed (#203811).
+- Added help into the Add-On Product Installation dialog.
+- Add and Delete buttons in the same dialog were moved to the left
+ side according the YaST style guide.
+- Disabling Delete button in case of no Products listed
+ (all filed as bug #203809).
+- Used a correct (another) icon in License Agreement dialog
+ (#203808).
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.13.148.tar.bz2
New:
----
yast2-installation-2.13.149.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.1tolJY/_old 2006-09-07 01:03:41.000000000 +0200
+++ /var/tmp/diff_new_pack.1tolJY/_new 2006-09-07 01:03:41.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.13.148)
+# spec file for package yast2-installation (Version 2.13.149)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-installation
-Version: 2.13.148
+Version: 2.13.149
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.13.148.tar.bz2
+Source0: yast2-installation-2.13.149.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-firewall yast2-slp yast2-testsuite
# remove yast2-slp and yast2-firewall once SourceManager is moved back to yast2-packager
@@ -60,7 +60,7 @@
Jiri Srain
%prep
-%setup -n yast2-installation-2.13.148
+%setup -n yast2-installation-2.13.149
%build
%{prefix}/bin/y2tool y2autoconf
@@ -132,6 +132,20 @@
%endif
%changelog -n yast2-installation
+* Wed Sep 06 2006 - mvidner@suse.cz
+- To allow adding unsigned sources, temporarily "rug set-pref
+ security-level none" when syncing in inst_source (#190403).
+- 2.13.149
+* Wed Sep 06 2006 - locilka@suse.cz
+- No such headline "Mode" in the Installation Settings dialog.
+ Help fixed (#203811).
+- Added help into the Add-On Product Installation dialog.
+- Add and Delete buttons in the same dialog were moved to the left
+ side according the YaST style guide.
+- Disabling Delete button in case of no Products listed
+ (all filed as bug #203809).
+- Used a correct (another) icon in License Agreement dialog
+ (#203808).
* Mon Sep 04 2006 - locilka@suse.cz
- Running Installation in Wizard Window (#203510).
- Needed binaries in inst-sys: xquery and fvwm-root.
++++++ yast2-installation-2.13.148.tar.bz2 -> yast2-installation-2.13.149.tar.bz2 ++++++
++++ 2394 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-installation-2.13.148/VERSION new/yast2-installation-2.13.149/VERSION
--- old/yast2-installation-2.13.148/VERSION 2006-09-04 16:01:07.000000000 +0200
+++ new/yast2-installation-2.13.149/VERSION 2006-09-06 17:40:53.000000000 +0200
@@ -1 +1 @@
-2.13.148
+2.13.149
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-installation-2.13.148/configure.in new/yast2-installation-2.13.149/configure.in
--- old/yast2-installation-2.13.148/configure.in 2006-09-04 16:03:51.000000000 +0200
+++ new/yast2-installation-2.13.149/configure.in 2006-09-06 19:25:21.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-installation
dnl
-dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.22 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.13.148, http://bugs.opensuse.org/, yast2-installation)
+AC_INIT(yast2-installation, 2.13.149, http://bugs.opensuse.org/, yast2-installation)
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.13.148"
+VERSION="2.13.149"
RPMNAME="yast2-installation"
MAINTAINER="Lukas Ocilka "
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-installation-2.13.148/control/docs/control-doc.xml new/yast2-installation-2.13.149/control/docs/control-doc.xml
--- old/yast2-installation-2.13.148/control/docs/control-doc.xml 2006-06-26 09:10:49.000000000 +0200
+++ new/yast2-installation-2.13.149/control/docs/control-doc.xml 2006-06-26 18:48:36.000000000 +0200
@@ -28,7 +28,7 @@
0.1
</revnumber>
<date>
- $Date: 2004-10-27 16:25:24 +0200 (Wed, 27 Oct 2004) $
+ $Date: 2004-10-27 16:25:24 +0200 (St, 27 říj 2004) $
</date>
<revremark>Initial Release as PDF</revremark>
</revision>
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-installation-2.13.148/src/clients/inst_proposal.ycp new/yast2-installation-2.13.149/src/clients/inst_proposal.ycp
--- old/yast2-installation-2.13.148/src/clients/inst_proposal.ycp 2006-07-31 09:45:04.000000000 +0200
+++ new/yast2-installation-2.13.149/src/clients/inst_proposal.ycp 2006-09-06 17:38:11.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Stefan Hundhammer
* Arvin Schnell
*
- * $Id: inst_proposal.ycp 32021 2006-07-27 12:23:54Z jsrain $
+ * $Id: inst_proposal.ycp 32719 2006-09-06 10:51:19Z locilka $
*
* Create and display reasonable proposal for basic
* installation and call sub-workflows as required
@@ -890,13 +890,15 @@
</p>
") + how_to_change;
- // Help text for installation proposal, continued
- help_text_string = help_text_string + _("<p>
-To update an existing &product; system instead of doing a new install,
-click the <b>Mode</b> headline or select <b>Mode</b> in the
-<b>Change...</b> menu.
-</p>
-");
+// kicking out, bug #203811
+// no such headline
+// // Help text for installation proposal, continued
+// help_text_string = help_text_string + _("<p>
+//To update an existing &product; system instead of doing a new install,
+//click the <b>Mode</b> headline or select <b>Mode</b> in the
+//<b>Change...</b> menu.
+//</p>
+//");
/**
* Deliberately omitting "boot installed system" here to avoid
* confusion: The user will be prompted for that if Linux
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-installation-2.13.148/src/include/add-on-workflow.ycp new/yast2-installation-2.13.149/src/include/add-on-workflow.ycp
--- old/yast2-installation-2.13.148/src/include/add-on-workflow.ycp 2006-08-09 12:31:06.000000000 +0200
+++ new/yast2-installation-2.13.149/src/include/add-on-workflow.ycp 2006-09-06 17:38:12.000000000 +0200
@@ -715,7 +715,13 @@
void Redraw (boolean enable_back, boolean enable_next) {
// main screen heading
string title = _("Add-On Product Installation");
- string help = "";
+
+ // Help for add-on products
+ string help = _("<p><big><b>Add-On Product Installation</b></big></br>
+Here you can see all add-on products that are selected for installation.
+To add a new product click <b>Add</b>, to remove already added one,
+select it and click <b>Delete</b>.</p>");
+
integer index = -1;
list items = maplist (map product, AddOnProduct::add_on_products, {
index = index + 1;
@@ -739,14 +745,23 @@
// table header
_("Product")),
items),
- `HBox (
- `PushButton (`id (`add), Label::AddButton ()),
- `PushButton (`id (`delete), Label::DeleteButton ())
+ `Left(
+ `HBox (
+ `PushButton (`id (`add), Label::AddButton ()),
+ `PushButton (`id (`delete), Label::DeleteButton ()),
+ `HStretch ()
+ )
)
);
Wizard::SetContents (title, contents, help, enable_back, enable_next);
Wizard::SetDesktopIcon("vendor");
+
+ // disable delete button if no items listed
+ // bug #203809
+ if (size(items) == 0) {
+ UI::ChangeWidget(`id (`delete), `Enabled, false);
+ }
}
symbol RunAddOnMainDialog(boolean enable_back, boolean enable_next) {
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-installation-2.13.148/src/modules/ProductLicense.ycp new/yast2-installation-2.13.149/src/modules/ProductLicense.ycp
--- old/yast2-installation-2.13.148/src/modules/ProductLicense.ycp 2006-07-18 11:27:47.000000000 +0200
+++ new/yast2-installation-2.13.149/src/modules/ProductLicense.ycp 2006-09-06 17:38:12.000000000 +0200
@@ -110,7 +110,7 @@
Wizard::SetContents(caption, contents, help,
false, back);
- Wizard::SetTitleIcon ("yast-addon");
+ Wizard::SetTitleIcon ("yast-license");
Wizard::SetFocusToNextButton();
}
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-installation-2.13.148/src/modules/SourceManager.ycp new/yast2-installation-2.13.149/src/modules/SourceManager.ycp
--- old/yast2-installation-2.13.148/src/modules/SourceManager.ycp 2006-08-09 12:31:06.000000000 +0200
+++ new/yast2-installation-2.13.149/src/modules/SourceManager.ycp 2006-09-06 17:42:07.000000000 +0200
@@ -7,7 +7,7 @@
* Martin Vidner
* Status: Work in Progress
*
- * $Id: SourceManager.ycp 32144 2006-08-04 07:26:35Z jsrain $
+ * $Id: SourceManager.ycp 32744 2006-09-06 15:43:42Z mvidner $
*
* Representation of the configuration of source-manager.
* Input and output routines.
@@ -1241,6 +1241,12 @@
return ret;
}
+ /**
+ * Sync the changed sources to ZenWorks
+ * @param added_src_ids ids of sources that were added
+ * @param deleted_src_ids ids of sources that were deleted
+ * @return success
+ */
global boolean SyncAddedAndDeleted (list<integer> added_src_ids,
list<integer> deleted_src_ids) {
boolean ret = false;
@@ -1250,6 +1256,9 @@
ret = true;
ResetKnownServiceCache ();
+ string zmd_security_level = RugGetPref ("security-level");
+ RugSetPref ("security-level", "none"); // #190403
+
// first delete, then add,
// otherwise replacing a source with itself fails: #175159
foreach (integer id, deleted_src_ids, {
@@ -1258,6 +1267,11 @@
foreach (integer id, added_src_ids, {
ret = AddOrDeleteZYPPServiceIntoZMD (id, true) && ret;
});
+
+ if (zmd_security_level != nil)
+ {
+ RugSetPref ("security-level", zmd_security_level);
+ }
}
ZMDRestore (zmd_handle);
Unlock ();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org