Author: aschnell Date: Tue Apr 21 13:57:50 2009 New Revision: 56877 URL: http://svn.opensuse.org/viewcvs/yast?rev=56877&view=rev Log: - some cleanup Modified: trunk/storage/storage/src/modules/StorageControllers.ycp Modified: trunk/storage/storage/src/modules/StorageControllers.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageControllers.ycp?rev=56877&r1=56876&r2=56877&view=diff ============================================================================== --- trunk/storage/storage/src/modules/StorageControllers.ycp (original) +++ trunk/storage/storage/src/modules/StorageControllers.ycp Tue Apr 21 13:57:50 2009 @@ -43,9 +43,6 @@ global string dasdParam = ""; - // -------------------------------------------------------------- - // local values - list controllers = []; // set by "Probe" // remember postinstall modules (like imm and ppa) @@ -207,7 +204,7 @@ * @returns integer number of controllers, 0 = none found */ global define integer Probe () - ``{ +{ y2milestone( "StorageControllers::Probe()" ); // probe 'storage' list @@ -219,7 +216,7 @@ y2milestone("no controllers"); } return size (controllers); - } +} @@ -284,7 +281,7 @@ // return false if loading failed or was not necessary at all define boolean startController (map controller) - ``{ +{ // check module information // skip controller if no module info available @@ -434,14 +431,14 @@ HwStatus::Set (unique_key, one_module_failed?`no:`yes); return (!one_module_failed); - } +} // local function to go through list of resources (list of maps) // checking if '"active":true' is set. define boolean anyActive (list<map> resources) -``{ +{ boolean active = size(resources)==0; foreach (map res, resources, @@ -458,7 +455,7 @@ * */ global define void StartHotplugStorage () - ``{ +{ import "Hotplug"; // If USB capable, there might be an usb storage device (i.e. ZIP) @@ -495,12 +492,10 @@ */ global define void Initialize() - ``{ +{ moduleNames = []; moduleArgs = []; - map controller = $[]; integer cindex = 0; - list ioresources = []; boolean module_loaded = false; ModToInitrd = []; @@ -513,7 +508,7 @@ // use while(), continue not allowed in foreach() while( !Arch::s390() && cindex < size(controllers) ) { - controller = controllers[cindex]:$[]; + map controller = controllers[cindex]:$[]; y2milestone( "Initialize controller %1", controller ); if( size(controller["requires"]:[])>0 ) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org