Author: aschnell Date: Tue Jan 5 17:07:41 2010 New Revision: 60237 URL: http://svn.opensuse.org/viewcvs/yast?rev=60237&view=rev Log: - removed unused parameter from function Storage::DeleteDevice Modified: trunk/autoinstallation/autoyast2.spec.in trunk/autoinstallation/src/modules/AutoinstLVM.ycp trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_dialogs.ycp trunk/storage/storage/src/include/ep-hd-lib.ycp trunk/storage/storage/src/include/ep-lib.ycp trunk/storage/storage/src/include/ep-nfs.ycp trunk/storage/storage/src/include/lvm_ui_dialogs.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/autoinstallation/autoyast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/autoyast2.spec.in?rev=60237&r1=60236&r2=60237&view=diff ============================================================================== --- trunk/autoinstallation/autoyast2.spec.in (original) +++ trunk/autoinstallation/autoyast2.spec.in Tue Jan 5 17:07:41 2010 @@ -8,6 +8,7 @@ BuildRequires: yast2 >= 2.16.36 # After API cleanup BuildRequires: yast2-update >= 2.18.3 +BuildRequires: yast2-storage >= 2.19.2 Requires: yast2 >= 2.16.36 Requires: yast2-core yast2-xml libxslt Modified: trunk/autoinstallation/src/modules/AutoinstLVM.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoinstLVM.ycp?rev=60237&r1=60236&r2=60237&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstLVM.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstLVM.ycp Tue Jan 5 17:07:41 2010 @@ -147,7 +147,7 @@ foreach(map lv, lvs, ``{ if (!contains(keepLVM[vgname]:[], lv["name"]:"")) { - Storage::DeleteDevice("","/dev/"+vgname+"/"+lv["name"]:"" ); + Storage::DeleteDevice("/dev/"+vgname+"/"+lv["name"]:""); } }); Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=60237&r1=60236&r2=60237&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Jan 5 17:07:41 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jan 05 16:59:39 CET 2010 - aschnell@suse.de + +- removed unused parameter from function Storage::DeleteDevice + +------------------------------------------------------------------- Mon Jan 04 14:29:41 CET 2010 - aschnell@suse.de - use ButtonBox widget (bnc #565871) Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/custom_part_dialogs.ycp?rev=60237&r1=60236&r2=60237&view=diff ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Tue Jan 5 17:07:41 2010 @@ -1497,8 +1497,7 @@ y2milestone( "deleteAllDevPartitions dp:%1", dp ); foreach( map part, dp, ``{ - go_on = go_on && - Storage::DeleteDevice( del_dev, part["device"]:"" ); + go_on = go_on && Storage::DeleteDevice(part["device"]:""); }); } } Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-hd-lib.ycp?rev=60237&r1=60236&r2=60237&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-hd-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-lib.ycp Tue Jan 5 17:07:41 2010 @@ -507,7 +507,7 @@ if (!isempty(partitions)) { foreach( string one_partition, pnames,{ - Storage::DeleteDevice( disk_info["device"]:"", one_partition ); + Storage::DeleteDevice(one_partition); }); } Modified: trunk/storage/storage/src/include/ep-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-lib.ycp?rev=60237&r1=60236&r2=60237&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lib.ycp Tue Jan 5 17:07:41 2010 @@ -232,8 +232,7 @@ { boolean recursive = Storage::GetRecursiveRemoval(); Storage::SetRecursiveRemoval( true ); - Storage::DeleteDevice( disk["device"]:"", - part["device"]:"" ); + Storage::DeleteDevice(part["device"]:""); Storage::SetRecursiveRemoval( recursive ); return true; } @@ -265,8 +264,7 @@ } else { - Storage::DeleteDevice( disk["device"]:"", - part["device"]:"" ); + Storage::DeleteDevice(part["device"]:""); } return true; } Modified: trunk/storage/storage/src/include/ep-nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-nfs.ycp?rev=60237&r1=60236&r2=60237&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-nfs.ycp (original) +++ trunk/storage/storage/src/include/ep-nfs.ycp Tue Jan 5 17:07:41 2010 @@ -142,7 +142,7 @@ //delete the one with old name and create new if (haskey(entry,"old_device")) { - Storage::DeleteDevice("/dev/nfs", entry["old_device"]:""); + Storage::DeleteDevice(entry["old_device"]:""); AddShare(entry); } else @@ -170,7 +170,7 @@ entry["device"]:"", entry["mount"]:"", entry["fstopt"]:""); string dev = entry["device"]:""; - Storage::DeleteDevice("/dev/nfs", dev ); + Storage::DeleteDevice(dev); } map line = ( map ) WFM::CallFunction("nfs-client4part", [ "HandleEvent", $[ "widget_id" : Event::IsWidgetActivated(event) ] ]); Modified: trunk/storage/storage/src/include/lvm_ui_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_ui_dialogs.ycp?rev=60237&r1=60236&r2=60237&view=diff ============================================================================== --- trunk/storage/storage/src/include/lvm_ui_dialogs.ycp (original) +++ trunk/storage/storage/src/include/lvm_ui_dialogs.ycp Tue Jan 5 17:07:41 2010 @@ -47,7 +47,7 @@ if( Popup::YesNo( message )) { - ret = Storage::DeleteDevice(disk["device"]:"", id); + ret = Storage::DeleteDevice(id); } } y2milestone( "HandleRemoveLv ret:%1", ret ); Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=60237&r1=60236&r2=60237&view=diff ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Tue Jan 5 17:07:41 2010 @@ -2432,9 +2432,9 @@ return( ret==0 ); } -global boolean DeleteDevice( string disk, string device ) +global boolean DeleteDevice(string device) { - y2milestone( "DeleteDevice disk:%1 device:%2", disk, device ); + y2milestone( "DeleteDevice device:%1", device ); integer ret = LibStorage::StorageInterface::removeVolume( sint, device ); if( ret<0 ) y2error( "DeleteDevice sint ret:%1", ret ); @@ -3308,7 +3308,7 @@ dps = sort( map a, map b, dps, ``(a["nr"]:0>b["nr"]:0)); y2milestone( "SetTargetMap dps:%1", dps ); } - foreach( map p, dps, ``{DeleteDevice( k, p["device"]:"" );}); + foreach( map p, dps, ``{DeleteDevice( p["device"]:"" );}); if( tg[k,"create"]:false ) { if( tg[k,"type"]:`CT_UNKNOWN==`CT_LVM ) @@ -3342,7 +3342,7 @@ ``{ if( size(p["dtxt"]:"")>0 ) ChangeDescText( p["device"]:"", p["dtxt"]:"" ); - DeleteDevice( k, p["device"]:"" ); + DeleteDevice( p["device"]:"" ); }); if( target[k,"delete"]:false ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org