Author: mfilka Date: Thu Feb 16 14:22:19 2012 New Revision: 67465 URL: http://svn.opensuse.org/viewcvs/yast?rev=67465&view=rev Log: removed some dead code, whitespaces Modified: trunk/nfs-client/package/yast2-nfs-client.changes trunk/nfs-client/src/Nfs.ycp trunk/nfs-client/src/ui.ycp Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-client.changes?rev=67465&r1=67464&r2=67465&view=diff ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Thu Feb 16 14:22:19 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Feb 16 13:16:18 UTC 2012 - mfilka@suse.com + +- removed some dead code, whitespaces + +------------------------------------------------------------------- Thu Feb 16 12:44:04 UTC 2012 - mfilka@suse.com - autoinstallation fails to enable portmapper/rpcbind service - bnc#744357 Modified: trunk/nfs-client/src/Nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/Nfs.ycp?rev=67465&r1=67464&r2=67465&view=diff ============================================================================== --- trunk/nfs-client/src/Nfs.ycp (original) +++ trunk/nfs-client/src/Nfs.ycp Thu Feb 16 14:22:19 2012 @@ -82,7 +82,7 @@ list<string> created_dirs = []; boolean ReadNfs4 () { - return (SCR::Read(.sysconfig.nfs.NFS4_SUPPORT)=="yes"); + return (SCR::Read(.sysconfig.nfs.NFS4_SUPPORT)=="yes"); } string ReadIdmapd() { @@ -375,11 +375,6 @@ return false; } -/* if (size (nfs_entries) == 0) - { - // Service::Adjust ("nfs", "disable"); // what if autofs needs it? - }*/ - portmapper = FindPortmapper(); if (size (nfs_entries) != 0) { @@ -636,8 +631,8 @@ return true; } - /** - * Return required packages for auto-installation + /** + * Return required packages for auto-installation * @return map of packages to be installed and to be removed */ global define map AutoPackages() ``{ Modified: trunk/nfs-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/ui.ycp?rev=67465&r1=67464&r2=67465&view=diff ============================================================================== --- trunk/nfs-client/src/ui.ycp (original) +++ trunk/nfs-client/src/ui.ycp Thu Feb 16 14:22:19 2012 @@ -129,7 +129,7 @@ /* Return convenient hostname (FaTE #302863) to be proposed * i.e. nfs + current domain (nfs. + suse.cz) - * @return string proposed hostname + * @return string proposed hostname */ define string ProposeHostname() { string ret = ""; @@ -586,7 +586,7 @@ EnableDisableButtons(); } - + void InitSettings( ) { CWMFirewallInterfaces::OpenFirewallInit (fw_cwm_widget, ""); @@ -594,16 +594,16 @@ UI::ChangeWidget( `id(`nfs4_domain), `Enabled, Nfs::nfs4_enabled != false); UI::ChangeWidget(`id(`nfs4_domain), `Value, Nfs::idmapd_domain); } - + void SaveFstabEntries( ) { Nfs::nfs_entries = nfs_entries; } - + void SaveSettings( map event ) { CWMFirewallInterfaces::OpenFirewallStore (fw_cwm_widget, "", event); - Nfs::nfs4_enabled = (boolean) UI::QueryWidget(`id(`enable_nfs4),`Value); + Nfs::nfs4_enabled = (boolean) UI::QueryWidget(`id(`enable_nfs4),`Value); Nfs::idmapd_domain = (string) UI::QueryWidget(`id(`nfs4_domain),`Value); } @@ -613,9 +613,6 @@ // handle the events, enable/disable the button, show the popup if button clicked if ( UI::WidgetExists(`id("_cwm_firewall_details")) && UI::WidgetExists(`id("_cwm_open_firewall")) ) CWMFirewallInterfaces::OpenFirewallHandle (fw_cwm_widget, "", $[ "ID" : widget ]); - /*changed = - true || // TODO: fw changed, #44106 - true; // TODO: nfs changed*/ if ( UI::WidgetExists(`id(`fstable)) ) entryno = (integer) UI::QueryWidget(`id(`fstable), `CurrentItem); @@ -719,7 +716,7 @@ do { - event = UI::WaitForEvent (); + event = UI::WaitForEvent (); ret = event["ID"]:nil; if (ret == `ok) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org