Hello community,
here is the log from the commit of package yast2-users
checked in at Fri Feb 23 13:09:59 CET 2007.
--------
--- yast2-users/yast2-users.changes 2007-02-22 10:06:54.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-users/yast2-users.changes 2007-02-22 15:34:06.315311000 +0100
@@ -1,0 +2,8 @@
+Thu Feb 22 15:23:12 CET 2007 - jsuchome@suse.cz
+
+- do not ask if package is available when it is not possible
+ to access installation source (#225484)
+- check if package is installed before checking if it is available
+- 2.15.13
+
+-------------------------------------------------------------------
Old:
----
yast2-users-2.15.12.tar.bz2
New:
----
yast2-users-2.15.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-users.spec ++++++
--- /var/tmp/diff_new_pack.pU2253/_old 2007-02-23 13:08:35.000000000 +0100
+++ /var/tmp/diff_new_pack.pU2253/_new 2007-02-23 13:08:35.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-users (Version 2.15.12)
+# spec file for package yast2-users (Version 2.15.13)
#
# 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-users
-Version: 2.15.12
+Version: 2.15.13
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-users-2.15.12.tar.bz2
+Source0: yast2-users-2.15.13.tar.bz2
prefix: /usr
BuildRequires: cracklib-devel doxygen gcc-c++ perl-Digest-SHA1 perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-ldap-client yast2-mail-aliases yast2-perl-bindings yast2-security yast2-testsuite
Requires: yast2 yast2-perl-bindings yast2-country yast2-pam yast2-security yast2-mail-aliases cracklib perl-Digest-SHA1 perl-X500-DN perl-gettext yast2-ldap-client
@@ -42,7 +42,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-users-2.15.12
+%setup -n yast2-users-2.15.13
%build
%{prefix}/bin/y2tool y2autoconf
@@ -86,6 +86,11 @@
%doc %{prefix}/share/doc/packages/yast2-users
%changelog
+* Thu Feb 22 2007 - jsuchome@suse.cz
+- do not ask if package is available when it is not possible
+ to access installation source (#225484)
+- check if package is installed before checking if it is available
+- 2.15.13
* Wed Feb 21 2007 - jsuchome@suse.cz
- implemented disabling of crypted home directories (#242531)
- when deleting crypted home, disable pam_mount
++++++ yast2-users-2.15.12.tar.bz2 -> yast2-users-2.15.13.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.15.12/src/dialogs.ycp new/yast2-users-2.15.13/src/dialogs.ycp
--- old/yast2-users-2.15.12/src/dialogs.ycp 2007-02-21 11:37:37.000000000 +0100
+++ new/yast2-users-2.15.13/src/dialogs.ycp 2007-02-22 15:25:07.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Johannes Buchhold ,
* Jiri Suchomel
*
- * $Id: dialogs.ycp 36132 2007-02-14 11:56:35Z jsuchome $
+ * $Id: dialogs.ycp 36377 2007-02-22 09:07:18Z jsuchome $
*/
{
@@ -2434,18 +2434,29 @@
list mb = [];
map to_string = $[
- // just the name (do not translate)
+ // menubutton label
"nis" : _("&NIS"),
- // just the name (do not translate)
+ // menubutton label
"nisplus" : _("N&IS+"),
- // just the name (do not translate)
+ // menubutton label
"ldap" : _("&LDAP"),
- // just the name (do not translate)
+ // menubutton label
"kerberos" : _("&Kerberos"),
- // just the name (do not translate)
+ // menubutton label
"samba" : _("&Samba"),
];
+ map client_label = $[
+ // richtext label
+ "nis" : _("NIS"),
+ // richtext label
+ "ldap" : _("LDAP"),
+ // richtext label
+ "kerberos" : _("Kerberos"),
+ // richtext label
+ "samba" : _("Samba"),
+ ];
+
// name of module to call
map call_module = $[
"samba": "samba-client",
@@ -2497,31 +2508,57 @@
/**
* Reloads the configuration and updates the auth-widget contents
+ * returns the summary value for richtext
*/
- define void reload_config() {
+ define string reload_config (list<string> clients) {
string summary = "";
- foreach (string client, available, {
+ if (clients == nil || clients == [])
+ clients = (list<string>) union (available, installed);
+ foreach (string client, clients, {
summary = Summary::AddHeader (summary, sformat (
"%2</a></font>",
- client,
- deletechars (to_string [client]:"", "&")));
+ client, client_label[client]:client));
summary = Summary::AddLine (summary, get_module_data (client));
});
- UI::ChangeWidget(`id(`summary), `Value, summary);
+ return summary;
}
+ /**
+ * helper: check availability of authentication packages and
+ * update the RichText summary accordingly
+ */
+ define void check_packages () {
- foreach (string client, configurable, {
- string package = sformat ("yast2-%1-client", client);
- if (Package::Available (package))
- {
- available = add (available, client);
- mb = add (mb, `item(`id(client), to_string[client]:""));
- }
- if (Package::Installed (package))
- installed = add (installed, client);
- });
+ boolean check_available = true; // save if more Available calls should be done (bug #225484)
+
+ foreach (string client, configurable, {
+ string package = sformat ("yast2-%1-client", client);
+ term client_item = `item (`id(client), to_string[client]:"");
+ if (Package::Installed (package))
+ {
+ installed = add (installed, client);
+ mb = add (mb, client_item);
+ UI::ChangeWidget (`id(`summary), `Value,
+ (string) UI::QueryWidget (`id (`summary),`Value) + reload_config ([client]));
+ }
+ else if (check_available)
+ {
+ boolean avai = Package::Available (package);
+ if (avai == nil)
+ {
+ check_available = false;
+ }
+ else if (avai)
+ {
+ available = add (available, client);
+ mb = add (mb, client_item);
+ UI::ChangeWidget (`id(`summary), `Value,
+ (string)UI::QueryWidget (`id (`summary),`Value) + reload_config ([client]));
+ }
+ }
+ });
+ }
term contents = `HBox(
`HSpacing(4),
@@ -2529,8 +2566,10 @@
`VSpacing(0.5),
`RichText (`id(`summary), ""),
`VSpacing( 0.5 ),
- // button label
- `MenuButton(`opt(`key_F4), _("&Configure..."), mb),
+ `ReplacePoint (`id (`rpbutton),
+ // button label
+ `MenuButton(`opt(`key_F4), _("&Configure..."), mb)
+ ),
`VSpacing (0.5)
),
`HSpacing(4)
@@ -2543,7 +2582,11 @@
Label::CancelButton(), Label::AcceptButton());
Wizard::HideAbortButton ();
- reload_config();
+ check_packages ();
+ if (size (mb) > 0)
+ {
+ UI::ReplaceWidget (`id (`rpbutton), `MenuButton(`opt(`key_F4), _("&Configure..."), mb));
+ }
any button = nil;
boolean changed = false;
@@ -2579,7 +2622,7 @@
(string)call_module[button]:button, param) == `next)
{
changed = true;
- reload_config ();
+ UI::ChangeWidget (`id(`summary), `Value, reload_config ([]));
Wizard::DisableBackButton();
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.15.12/src/Users.pm new/yast2-users-2.15.13/src/Users.pm
--- old/yast2-users-2.15.12/src/Users.pm 2007-02-21 15:39:56.000000000 +0100
+++ new/yast2-users-2.15.13/src/Users.pm 2007-02-22 10:07:20.000000000 +0100
@@ -4,7 +4,7 @@
# Package: Configuration of users and groups
# Summary: I/O routines + main data structures
#
-# $Id: Users.pm 35837 2007-02-05 10:22:03Z jsuchome $
+# $Id: Users.pm 36377 2007-02-22 09:07:18Z jsuchome $
#
package Users;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.15.12/src/widgets.ycp new/yast2-users-2.15.13/src/widgets.ycp
--- old/yast2-users-2.15.12/src/widgets.ycp 2007-02-21 15:03:59.000000000 +0100
+++ new/yast2-users-2.15.13/src/widgets.ycp 2007-02-22 10:07:20.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Widgets definitions and helper functions
* Authors: Jiri Suchomel
*
- * $Id: widgets.ycp 34986 2006-12-19 15:41:01Z jsuchome $
+ * $Id: widgets.ycp 36377 2007-02-22 09:07:18Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.15.12/VERSION new/yast2-users-2.15.13/VERSION
--- old/yast2-users-2.15.12/VERSION 2007-02-21 15:55:14.000000000 +0100
+++ new/yast2-users-2.15.13/VERSION 2007-02-22 15:24:37.000000000 +0100
@@ -1 +1 @@
-2.15.12
+2.15.13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org