Author: aschnell Date: Wed Feb 15 16:24:13 2012 New Revision: 67449 URL: http://svn.opensuse.org/viewcvs/yast?rev=67449&view=rev Log: - removed unused parameter from FormatDisks Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67449&r1=67448&r2=67449&view=diff ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Wed Feb 15 16:24:13 2012 @@ -445,7 +445,7 @@ list<string> devices = maplist (integer id, selected, { return DASDController::devices[id, "dev_name"]:""; }); - DASDController::FormatDisks (devices, par, write_vl, true); + DASDController::FormatDisks(devices, par, write_vl); DASDController::ProbeDisks(); ReloadDASDDialog (); UI::SetFocus (`table); Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.ycp?rev=67449&r1=67448&r2=67449&view=diff ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Wed Feb 15 16:24:13 2012 @@ -32,17 +32,12 @@ global void ActivateDisk (string channel, boolean diag); global void DeactivateDisk (string channel, boolean diag); global void ProbeDisks (); -global void FormatDisks (list<string> disks_list, integer par, - boolean write_vl, boolean interactive); +global void FormatDisks(list<string> disks_list, integer par, boolean write_vl); global string GetPartitionInfo (string disk); - -boolean disk_configured = false; +global boolean GetModified(); -/** - * Prototypes - */ -global boolean Modified(); +boolean disk_configured = false; /** @@ -60,7 +55,8 @@ * Abort function * return boolean return true if abort */ -global boolean() AbortFunction = Modified; +global boolean() AbortFunction = GetModified; + /** * Abort function @@ -93,7 +89,8 @@ * Is this kind of disk controller available? * @return boolean true if it is */ -global boolean Available () { +global boolean Available() +{ return true; } @@ -124,7 +121,7 @@ { ProbeDisks(); - if (Mode::config()) + if (Mode::config()) // TODO { devices = mapmap(integer index, map<string, any> d, devices, { d["format"] = d["format"]:false; @@ -144,7 +141,7 @@ */ global boolean Write() { - if (Mode::config()) + if (Mode::config()) // TODO { list<string> to_format = []; @@ -165,7 +162,7 @@ y2milestone ("Disks to format: %1", to_format); if (!isempty(to_format)) - FormatDisks(to_format, 8, true, true); + FormatDisks(to_format, 8, true); } if (disk_configured && Mode::normal ()) @@ -214,12 +211,9 @@ global map<string, list> Export() { list<map<string, any> > l = maplist(integer i, map<string, any> d, devices, { - - d = filter(string k, any v, d, { + return filter(string k, any v, d, { return contains([ "channel", "format", "diag" ], k); }); - - return d; }); return $[ "devices" : l ]; @@ -290,7 +284,7 @@ list<string> ret = maplist (integer index, map<string,any> d, devices, { // summary text, %1 is channel ID (number), // %2 and %3 are Yes or No - return sformat(_("Channel: %1, Format: %2, Use DIAG: %3"), d["channel"]:"", + return sformat(_("Channel: %1, Format: %2, DIAG: %3"), d["channel"]:"", String::YesNo(d["format"]:false), String::YesNo(d["diag"]:false)); }); y2milestone ("Summary: %1", ret); @@ -485,8 +479,7 @@ string cmd = sformat("ls '/sys/bus/ccw/devices/%1/block/' | tr -d '\n'", channel); map<string, any> disk = (map<string, any>)SCR::Execute(.target.bash_output, cmd); if (disk["exit"]:-1 == 0 && size(disk["stdout"]:"")>0){ - FormatDisks ([ sformat("/dev/%1", disk["stdout"]:"") ], 1, true, true); -// ReloadDASDDialog (); + FormatDisks([ sformat("/dev/%1", disk["stdout"]:"") ], 1, true); ActivateDisk(channel, diag); } else { Popup::Error(sformat("Couldn't find device for %1 channel", channel)); @@ -528,10 +521,8 @@ * @param disks_list list<string> List of disks to be formated * @param par integer Number of disks that can be formated in parallel * @param write_vl boolean Write a Volume label - * @param interactive boolean Interactive yes/no */ -global void FormatDisks(list<string> disks_list, integer par, boolean write_vl, - boolean interactive) +global void FormatDisks(list<string> disks_list, integer par, boolean write_vl) { if (par > size (disks_list)) par = size (disks_list); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org