Mailinglist Archive: yast-commit (953 mails)

< Previous Next >
[yast-commit] r49565 - in /trunk/storage/storage/src: inst_custom_part.ycp modules/Storage.ycp
  • From: aschnell@xxxxxxxxxxxxxxxx
  • Date: Fri, 01 Aug 2008 09:56:39 -0000
  • Message-id: <20080801095639.D1A76272A0@xxxxxxxxxxxxxxxx>
Author: aschnell
Date: Fri Aug 1 11:56:39 2008
New Revision: 49565

URL: http://svn.opensuse.org/viewcvs/yast?rev=49565&view=rev
Log:
- removed obsolete code

Modified:
trunk/storage/storage/src/inst_custom_part.ycp
trunk/storage/storage/src/modules/Storage.ycp

Modified: trunk/storage/storage/src/inst_custom_part.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_part.ycp?rev=49565&r1=49564&r2=49565&view=diff
==============================================================================
--- trunk/storage/storage/src/inst_custom_part.ycp (original)
+++ trunk/storage/storage/src/inst_custom_part.ycp Fri Aug 1 11:56:39 2008
@@ -48,9 +48,6 @@
import "StorageDevices";
import "ProductFeatures";

- list hitlist = [];
- boolean hiterror = false;
-
include "partitioning/partition_defines.ycp";
include "partitioning/loop.ycp";
include "partitioning/nfs.ycp";
@@ -64,9 +61,6 @@
include "partitioning/evms_lib.ycp";


- // hide some details in the table by default
- boolean show_T_details = Storage::GetExpertDetail();
-
boolean show_disk = true;
boolean edit_cylinder = true;
boolean bsd_label = false;
@@ -81,18 +75,12 @@
boolean button_loop = true; // Should the "LOOP" -Button be
shown in main window
boolean button_nfs = true; // Should the "NFS" -Button be
shown in main window
boolean button_lvm = true; // Should the "LVM" -Button be
shown in main window
- // Should the "EVMS" -Button be
shown in main window
- boolean button_evms = ProductFeatures::GetBooleanFeature
("partitioning", "evms_config");
boolean button_expert = true; // Should the "EXPERT"-Button be
shown in main window
boolean button_delete_parttable = true; // Should the "Delete partition
table and disk label"
// -Button be shown in Expert menu
boolean button_adapt_mp = false; // Should the "Adapt mount points
from
// existing /etc/fstab" -Button
be shown in Expert menu

- if( button_evms && Mode::normal() &&
- SCR::Read( .target.size, "/usr/share/YaST2/clients/inst_evms.ycp" )<=0 )
- button_evms = false;
- y2milestone( "EVMS:%1", button_evms );
boolean test_mode = Mode::test ();
string boot_mode = "fritz";
string focusline = "";
@@ -2231,10 +2219,6 @@
// main dialog: Button LVM
buttonline_b = add( buttonline_b, `PushButton(`id(`lvm), _("&LVM...")));

- if( button_evms )
- // main dialog: Button EVMS
- buttonline_b = add( buttonline_b, `PushButton(`id(`evms),
_("E&VMS...")));
-
// main dialog: Button RAID
if( button_raid )
buttonline_b =
@@ -2260,7 +2244,7 @@

// check box
term details_checkbox = `Left (
- `CheckBox (`id(`show_table_details), `opt(`notify), _("&Show Details"),
show_T_details)
+ `CheckBox (`id(`show_table_details), `opt(`notify), _("&Show Details"))
);

string help_text = "";
@@ -3130,8 +3114,6 @@
Wizard::RestoreBackButton();
}

- Storage::SetExpertDetail( show_T_details );
- Storage::SaveExpertDetail();


Wizard::RestoreHelp( help_text );

Modified: trunk/storage/storage/src/modules/Storage.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=49565&r1=49564&r2=49565&view=diff
==============================================================================
--- trunk/storage/storage/src/modules/Storage.ycp (original)
+++ trunk/storage/storage/src/modules/Storage.ycp Fri Aug 1 11:56:39 2008
@@ -7052,64 +7052,6 @@
return( no_propose_disks );
}

-boolean expert_detail = nil;
-
-list FindExpertLine( map file )
- {
- list ret = [];
- list<list> t = maplist( integer k, map e, file["l"]:$[],
- ``([k, e["line"]:""]));
- t = filter( list e, t, ``(search(e[1]:"","EXPERT_DETAIL")==0));
- y2milestone( "FindExpertLine t:%1", t );
- ret = t[0]:[];
- y2milestone( "FindExpertLine ret:%1", ret );
- return( ret );
- }
-
-global boolean GetExpertDetail()
- {
- if( expert_detail==nil )
- {
- map file = $[];
- AsciiFile::ReadFile( file, "/etc/sysconfig/storage" );
- y2milestone( "GetExpertDetail file:%1", file );
- list l = FindExpertLine( file );
- y2milestone( "GetExpertDetail l:%1", l );
- l = filter( string s, splitstring( l[1]:"", "= " ), ``(size(s)>0));
- y2milestone( "GetExpertDetail l:%1", l );
- if( tointeger(l[1]:"0")==0 )
- expert_detail=false;
- else
- expert_detail=true;
- }
- y2milestone( "GetExpertDetail ret:%1", expert_detail );
- return( expert_detail );
- }
-
-global void SetExpertDetail( boolean val )
- {
- y2milestone( "SetExpertDetail val:%1", val );
- expert_detail = val;
- }
-
-global void SaveExpertDetail()
- {
- y2milestone( "SaveExpertDetail val:%1", expert_detail );
- if( expert_detail!=nil )
- {
- map file = $[];
- AsciiFile::ReadFile( file, "/etc/sysconfig/storage" );
- list l = FindExpertLine( file );
- string e = "EXPERT_DETAIL=" + (expert_detail?"1":"0");
- integer lineno = l[0]:(size(file["l"]:$[]) + 1);
- if( size(l)==0 )
- file["l",lineno] = $[];
- file["l",lineno,"line"] = e;
- file["l",lineno,"changed"] = true;
- AsciiFile::RewriteFile( file, "/etc/sysconfig/storage" );
- }
- }
-

global void SetDefaultMountBy(symbol mby)
{

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages