Hello community, here is the log from the commit of package yast2-dhcp-server checked in at Thu May 17 11:25:43 CEST 2007. -------- --- yast2-dhcp-server/yast2-dhcp-server.changes 2007-01-23 10:21:23.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-dhcp-server/yast2-dhcp-server.changes 2007-05-15 14:20:54.816643000 +0200 @@ -1,0 +2,7 @@ +Tue May 15 14:02:35 CEST 2007 - kmachalkova@suse.cz + +- Dropped simple vs. expert UI mode support (ProductFeatures): + expert mode is now default +- 2.15.2 + +------------------------------------------------------------------- Old: ---- yast2-dhcp-server-2.15.1.tar.bz2 New: ---- yast2-dhcp-server-2.15.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-dhcp-server.spec ++++++ --- /var/tmp/diff_new_pack.J24629/_old 2007-05-17 11:25:33.000000000 +0200 +++ /var/tmp/diff_new_pack.J24629/_new 2007-05-17 11:25:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-dhcp-server (Version 2.15.1) +# spec file for package yast2-dhcp-server (Version 2.15.2) # # 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-dhcp-server -Version: 2.15.1 +Version: 2.15.2 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-dhcp-server-2.15.1.tar.bz2 +Source0: yast2-dhcp-server-2.15.2.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-Digest-SHA1 perl-X500-DN perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-dns-server yast2-perl-bindings yast2-testsuite Requires: perl-gettext yast2-perl-bindings bind-utils perl-X500-DN yast2-ldap perl-Digest-SHA1 perl-Parse-RecDescent @@ -40,7 +40,7 @@ Lukas Ocilka <locilka@suse.cz> %prep -%setup -n yast2-dhcp-server-2.15.1 +%setup -n yast2-dhcp-server-2.15.2 %build %{prefix}/bin/y2tool y2autoconf @@ -77,7 +77,11 @@ %doc %{prefix}/share/doc/packages/yast2-dhcp-server /usr/share/YaST2/schema/autoyast/rnc/dhcp-server.rnc -%changelog -n yast2-dhcp-server +%changelog +* Tue May 15 2007 - kmachalkova@suse.cz +- Dropped simple vs. expert UI mode support (ProductFeatures): + expert mode is now default +- 2.15.2 * Mon Jan 22 2007 - kmachalkova@suse.cz - If gathering interface information by parsing ifconfig output fails, use NetworkDevices data. Inform user that interface has no ++++++ yast2-dhcp-server-2.15.1.tar.bz2 -> yast2-dhcp-server-2.15.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dhcp-server-2.15.1/src/DhcpServer.pm new/yast2-dhcp-server-2.15.2/src/DhcpServer.pm --- old/yast2-dhcp-server-2.15.1/src/DhcpServer.pm 2007-01-22 17:52:05.000000000 +0100 +++ new/yast2-dhcp-server-2.15.2/src/DhcpServer.pm 2007-05-15 11:56:33.000000000 +0200 @@ -107,7 +107,7 @@ YaST::YCP::Import ("NetworkDevices"); YaST::YCP::Import ("Netmask"); YaST::YCP::Import ("PackageSystem"); -YaST::YCP::Import ("ProductFeatures"); +#YaST::YCP::Import ("ProductFeatures"); YaST::YCP::Import ("Service"); YaST::YCP::Import ("Popup"); YaST::YCP::Import ("Progress"); @@ -1842,13 +1842,12 @@ @allowed_interfaces = sort (keys (%ifaces)); @original_allowed_interfaces = @allowed_interfaces; - # Initialize LDAP if needed - if (ProductFeatures->GetFeature ("globals", "ui_mode") ne "simple") - { - $self->InitYapiConfigOptions ({"use_ldap" => $use_ldap}); - $self->LdapInit ([], 1); - $self->CleanYapiConfigOptions (); - } + # Initialize LDAP + + $self->InitYapiConfigOptions ({"use_ldap" => $use_ldap}); + $self->LdapInit ([], 1); + $self->CleanYapiConfigOptions (); + } } @@ -1911,10 +1910,6 @@ sub IsConfigurationSimple { my $self = shift; - if (ProductFeatures->GetFeature ("globals", "ui_mode") eq "simple") - { - return Boolean (1); - } y2milestone ("Checking how complex configuration is set"); if (scalar (@allowed_interfaces) > 1) @@ -2293,10 +2288,6 @@ $use_ldap = 0; my $configured_ldap = 0; - if (ProductFeatures->GetFeature ("globals", "ui_mode") eq "simple") - { - return; - } #error message my $ldap_error_msg = __("Invalid LDAP configuration. Cannot use LDAP."); @@ -2600,11 +2591,6 @@ sub LdapPrepareToWrite { my $self = shift; - if (ProductFeatures->GetFeature ("globals", "ui_mode") eq "simple") - { - return; - } - my $ldap_data_ref = Ldap->Export (); # check if the schema is properly included @@ -2849,11 +2835,6 @@ sub LdapStore { my $self = shift; - if (ProductFeatures->GetFeature ("globals", "ui_mode") eq "simple") - { - return 1; - } - my $ret = 1; if (Mode->test ()) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dhcp-server-2.15.1/src/dialogs2.ycp new/yast2-dhcp-server-2.15.2/src/dialogs2.ycp --- old/yast2-dhcp-server-2.15.1/src/dialogs2.ycp 2007-01-23 10:18:43.000000000 +0100 +++ new/yast2-dhcp-server-2.15.2/src/dialogs2.ycp 2007-05-15 14:15:15.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Vladimír Bobek <vbobek@suse.cz> * - * $Id: dialogs2.ycp 35611 2007-01-23 09:18:41Z kmachalkova $ + * $Id: dialogs2.ycp 37974 2007-05-15 12:15:13Z kmachalkova $ */ { @@ -22,7 +22,7 @@ import "Progress"; import "DialogTree"; import "CWMServiceStart"; -import "ProductFeatures"; +//import "ProductFeatures"; import "NetworkDevices"; import "Report"; import "Mode"; @@ -34,7 +34,7 @@ include "dhcp-server/dns-server-wizard.ycp"; /* Using expert UI */ -define boolean expert_ui = (ProductFeatures::GetFeature ("globals", "ui_mode") == "expert"); +//define boolean expert_ui = (ProductFeatures::GetFeature ("globals", "ui_mode") == "expert"); /* Start of common configuration section */ @@ -209,20 +209,9 @@ list <string> dhcp_ifaces = DhcpServer::GetAllowedInterfaces (); - // expert UI allows to set more interfaces - if (expert_ui) { - foreach (string iface, map <string, any> settings, DhcpServerUI::ifaces, { - if (contains(dhcp_ifaces, iface)) DhcpServerUI::ifaces[iface,"active"] = true; - }); - // simple UI allows to set only _ONE_ interface - // because of only one subnet in the simple UI dialogs - } else { - if ( size(dhcp_ifaces) > 1 ) { - y2warning ("More than one interface allowed, using the first one only."); - } - dhcp_ifaces = [dhcp_ifaces[0]:""]; - DhcpServerUI::ifaces[dhcp_ifaces[0]:"","active"] = true; - } + foreach (string iface, map <string, any> settings, DhcpServerUI::ifaces, { + if (contains(dhcp_ifaces, iface)) DhcpServerUI::ifaces[iface,"active"] = true; + }); RedrawInterfacesTable(); } @@ -234,22 +223,10 @@ current_item_iface = item_id; - if (expert_ui) { - if (event["ID"]:nil == "add") { - DhcpServerUI::ifaces[item_id,"active"] = true; - } else if (event["ID"]:nil == "remove") { - DhcpServerUI::ifaces[item_id,"active"] = false; - } - } else { - if (event["ID"]:nil == "add") { - // only one can be selected - foreach (string iface, map <string, any> settings, DhcpServerUI::ifaces, { - DhcpServerUI::ifaces[iface,"active"] = false; - }); - DhcpServerUI::ifaces[item_id,"active"] = true; - } else if (event["ID"]:nil == "remove") { - DhcpServerUI::ifaces[item_id,"active"] = false; - } + if (event["ID"]:nil == "add") { + DhcpServerUI::ifaces[item_id,"active"] = true; + } else if (event["ID"]:nil == "remove") { + DhcpServerUI::ifaces[item_id,"active"] = false; } RedrawInterfacesTable(); @@ -309,9 +286,7 @@ * @return term for Get_CommonDialog() */ term Common_GlobalSettingsDialog() { - term ldap = `Empty(); - - if (expert_ui) ldap = `VBox( + term ldap = `VBox( // configuration will be saved in ldap? `HBox ( `Left(`CheckBox(`id("ldap"), `opt( `notify), _("&LDAP Support"), true)), @@ -469,12 +444,10 @@ UI::ChangeWidget ( `id ("defaultleasetime"), `Value, tostring (value) ); UI::ChangeWidget ( `id ("defaultleasetimeunits"), `Value, unit ); - if (expert_ui) { - boolean ldap_in_use = DhcpServer::GetUseLdap(); - UI::ChangeWidget (`id ("ldap"), `Value, ldap_in_use); - UI::ChangeWidget (`id ("ldap-dhcp-server-cn"), `Value, DhcpServer::GetLdapDHCPServerCN()); - UI::ChangeWidget (`id ("ldap-dhcp-server-cn"), `Enabled, ldap_in_use); - } + boolean ldap_in_use = DhcpServer::GetUseLdap(); + UI::ChangeWidget (`id ("ldap"), `Value, ldap_in_use); + UI::ChangeWidget (`id ("ldap-dhcp-server-cn"), `Value, DhcpServer::GetLdapDHCPServerCN()); + UI::ChangeWidget (`id ("ldap-dhcp-server-cn"), `Enabled, ldap_in_use); GlobalSettingsValidChars (); } @@ -1686,8 +1659,9 @@ "start_up" : $[ "contents" : `VBox ( "auto_start_up", - `VSpacing(), +// `VSpacing(), "use_ldap", + `VSpacing(), "start_stop", `VSpacing(), "other_options", @@ -1833,7 +1807,7 @@ "store" : CardSelectionStore, "validate_type" : `function, "validate_function" : CardSelectionValidate, - "help" : (expert_ui ? HELPS["card_selection_expert"]:"" : HELPS["card_selection_simple"]:""), + "help" : HELPS["card_selection_expert"]:"", ], "global_settings" : $[ "widget" : `custom, @@ -1843,8 +1817,7 @@ "validate_type" : `function, "validate_function" : GlobalSettingsValidate, "store" : GlobalSettingsStore, - "help" : (expert_ui ? (HELPS["ldap_support"]:"" + HELPS["ldap_server_name"]:"" + HELPS["global_settings"]:"") - : HELPS["global_settings"]:""), + "help" : HELPS["ldap_support"]:"" + HELPS["ldap_server_name"]:"" + HELPS["global_settings"]:"" ], "dynamic_dhcp" : $[ "widget" : `custom, @@ -1890,14 +1863,8 @@ * @return symbol for the wizard sequencer */ symbol CommonConfigDialog () { - list<string> ids_order= []; - if (expert_ui) { - ids_order = ["start_up", "card_selection", "global_settings", + list <string> ids_order = ["start_up", "card_selection", "global_settings", "dynamic_dhcp", "host_management", "expert_settings"]; - } else { - ids_order = ["start_up", "card_selection", - "global_settings", "dynamic_dhcp"]; - } return DialogTree::ShowAndRun ($[ "ids_order" : ids_order, "initial_screen" : "start_up", diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dhcp-server-2.15.1/src/helps.ycp new/yast2-dhcp-server-2.15.2/src/helps.ycp --- old/yast2-dhcp-server-2.15.1/src/helps.ycp 2007-01-22 17:51:50.000000000 +0100 +++ new/yast2-dhcp-server-2.15.2/src/helps.ycp 2007-05-15 14:15:15.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Help texts of all the dialogs * Authors: Jiri Srain <jsrain@suse.cz> * - * $Id: helps.ycp 35605 2007-01-22 16:51:49Z kmachalkova $ + * $Id: helps.ycp 37974 2007-05-15 12:15:13Z kmachalkova $ */ { @@ -138,10 +138,7 @@ "card_selection_expert" : _("<p><b><big>Network Card Selection</big></b><br> Select one or more of listed network cards to use for the DHCP server.</p>"), - // Wizard Installation - Step 1 (version for simple UI) - "card_selection_simple" : _("<p><b><big>Network Card Selection</big></b><br> -Select one of listed network cards to use for the DHCP server.</p>"), - + //Optional field - used with LDAP support "ldap_server_name" : _("Optionally, you can also specify <b>DHCP server name</b> (the name of dhcpServer LDAP object), if it is different from your hostname."), diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dhcp-server-2.15.1/VERSION new/yast2-dhcp-server-2.15.2/VERSION --- old/yast2-dhcp-server-2.15.1/VERSION 2007-01-22 18:30:58.000000000 +0100 +++ new/yast2-dhcp-server-2.15.2/VERSION 2007-05-15 14:12:44.000000000 +0200 @@ -1 +1 @@ -2.15.1 +2.15.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠Hilbert.suse.de