[yast-commit] r41564 - in /trunk/repair: VERSION package/yast2-repair.changes src/OSRBoot.ycp src/OSRFloppy.ycp src/OSRFstab.ycp src/OSRPtbl.ycp src/osr_module_init.ycp src/osr_module_partition.ycp

Author: jsuchome Date: Thu Oct 25 13:37:43 2007 New Revision: 41564 URL: http://svn.opensuse.org/viewcvs/yast?rev=41564&view=rev Log: - adapted for the API change in yast2-storage (#335582) (patch from fehr) - 2.16.1 Modified: trunk/repair/VERSION trunk/repair/package/yast2-repair.changes trunk/repair/src/OSRBoot.ycp trunk/repair/src/OSRFloppy.ycp trunk/repair/src/OSRFstab.ycp trunk/repair/src/OSRPtbl.ycp trunk/repair/src/osr_module_init.ycp trunk/repair/src/osr_module_partition.ycp Modified: trunk/repair/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/VERSION?rev=41564&r1=41563&r2=41564&view=diff ============================================================================== --- trunk/repair/VERSION (original) +++ trunk/repair/VERSION Thu Oct 25 13:37:43 2007 @@ -1 +1 @@ -2.16.0 +2.16.1 Modified: trunk/repair/package/yast2-repair.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/package/yast2-repair.changes?rev=41564&r1=41563&r2=41564&view=diff ============================================================================== --- trunk/repair/package/yast2-repair.changes (original) +++ trunk/repair/package/yast2-repair.changes Thu Oct 25 13:37:43 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 25 10:00:20 CEST 2007 - jsuchome@suse.cz + +- adapted for the API change in yast2-storage (#335582) +- 2.16.1 + +------------------------------------------------------------------- Wed Oct 3 11:40:11 CEST 2007 - jsuchome@suse.cz - adapt for API change in yast2-bootloader (#329702) Modified: trunk/repair/src/OSRBoot.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRBoot.ycp?rev=41564&r1=41563&r2=41564&view=diff ============================================================================== --- trunk/repair/src/OSRBoot.ycp (original) +++ trunk/repair/src/OSRBoot.ycp Thu Oct 25 13:37:43 2007 @@ -722,9 +722,9 @@ if(dev_name == "" ) return true; // if device is a floppy - if( StorageDevices::FloppyDrives == [] || StorageDevices::FloppyDrives == nil ) StorageDevices::Probe(false); - y2milestone("FloppyDrives %1", StorageDevices::FloppyDrives ); - map ret = find(map e, StorageDevices::FloppyDrives, ``(e["dev_orig"]:(e["dev_name"]:"") == dev_name)); + if( StorageDevices::FloppyDrives() == [] || StorageDevices::FloppyDrives == nil ) StorageDevices::Probe(false); + y2milestone("FloppyDrives %1", StorageDevices::FloppyDrives() ); + map ret = find(map e, StorageDevices::FloppyDrives(), ``(e["dev_orig"]:(e["dev_name"]:"") == dev_name)); if ( ret != nil && size( ret ) > 0 ) return true; // if device is a hard disk Modified: trunk/repair/src/OSRFloppy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRFloppy.ycp?rev=41564&r1=41563&r2=41564&view=diff ============================================================================== --- trunk/repair/src/OSRFloppy.ycp (original) +++ trunk/repair/src/OSRFloppy.ycp Thu Oct 25 13:37:43 2007 @@ -41,7 +41,7 @@ /** * Default floppy device */ - global string floppy_device = StorageDevices::FloppyDevice; + global string floppy_device = StorageDevices::FloppyDevice(); /** * Supported file systems @@ -71,7 +71,7 @@ */ define boolean CheckPresent()``{ - if ( ! StorageDevices::FloppyPresent ) + if ( ! StorageDevices::FloppyPresent() ) { // error message string message = _(" Modified: trunk/repair/src/OSRFstab.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRFstab.ycp?rev=41564&r1=41563&r2=41564&view=diff ============================================================================== --- trunk/repair/src/OSRFstab.ycp (original) +++ trunk/repair/src/OSRFstab.ycp Thu Oct 25 13:37:43 2007 @@ -578,7 +578,7 @@ map ret = StorageDevices::GetCdromEntry( dev_name); if (ret == $[] || ret == nil) { - ret = find(map e, StorageDevices::cddrives, ``(e["linkname"]:"" == dev_name)); + ret = find(map e, StorageDevices::cddrives(), ``(e["linkname"]:"" == dev_name)); // check link if (ret == nil) { @@ -596,15 +596,15 @@ ret = StorageDevices::GetCdromEntry( link); if (ret == $[] || ret == nil) { - //y2milestone(" StorageDevices :: %1 " ,StorageDevices::cddrives); - ret = find(map e, StorageDevices::cddrives, ``(e["linkname"]:"" == link)); + //y2milestone(" StorageDevices :: %1 " ,StorageDevices::cddrives()); + ret = find(map e, StorageDevices::cddrives(), ``(e["linkname"]:"" == link)); } y2milestone(" ret in check link %1", ret); } } if (ret == $[] || ret == nil) { - ret = find(map e, StorageDevices::FloppyDrives, ``(e["dev_orig"]:(e["dev_name"]:"") == dev_name)); + ret = find(map e, StorageDevices::FloppyDrives(), ``(e["dev_orig"]:(e["dev_name"]:"") == dev_name)); if (ret != $[] && ret != nil) ret["found"] = "floppy"; } else { @@ -613,7 +613,7 @@ if (ret == $[] || ret == nil) { list lret = maplist (string n, map m, - filter (string k, map e, (map)StorageDevices::ZipDrives, + filter (string k, map e, StorageDevices::ZipDrives(), ``(e["dev_orig"]:(e["dev_name"]:"") == dev_name)), ``(m)); ret = lret[0]:$[]; if (ret != $[] && ret != nil) ret["found"] = "zip"; @@ -974,15 +974,15 @@ ] ); dev2check = (list<string>) union (dev2check, - maplist (map d, StorageDevices::cddrives, + maplist (map d, StorageDevices::cddrives(), ``(d["dev_orig"]:(d["dev_name"]:"")))); dev2check = (list<string>) union (dev2check, - maplist (map d, StorageDevices::FloppyDrives, + maplist (map d, StorageDevices::FloppyDrives(), ``(d["dev_orig"]:(d["dev_name"]:"")))); dev2check = (list<string>) union (dev2check, - maplist (string k, map d, (map) StorageDevices::ZipDrives, + maplist (string k, map d, StorageDevices::ZipDrives(), ``(d["dev_orig"]:(d["dev_name"]:"")))); return dev2check; Modified: trunk/repair/src/OSRPtbl.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/OSRPtbl.ycp?rev=41564&r1=41563&r2=41564&view=diff ============================================================================== --- trunk/repair/src/OSRPtbl.ycp (original) +++ trunk/repair/src/OSRPtbl.ycp Thu Oct 25 13:37:43 2007 @@ -116,7 +116,7 @@ global define void OSRPtbl()``{ - if (! StorageDevices::FloppyPresent ) + if (! StorageDevices::FloppyPresent() ) { // filter floppy repair methode y2milestone("filter floppy repair methode. No floppy found"); Modified: trunk/repair/src/osr_module_init.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/osr_module_init.ycp?rev=41564&r1=41563&r2=41564&view=diff ============================================================================== --- trunk/repair/src/osr_module_init.ycp (original) +++ trunk/repair/src/osr_module_init.ycp Thu Oct 25 13:37:43 2007 @@ -43,7 +43,7 @@ // ///////////////////////////////////////////////////////////////////////// - if ( size( StorageDevices::FloppyDrives) == 1 ) + if ( size( StorageDevices::FloppyDrives()) == 1 ) { // summary text, %1 is floppy device OSRSummary::DetectOK("",sformat(_("Floppy device found on %1"), @@ -51,10 +51,10 @@ OSRCommon::ProvideBoolean("has_floppy", true); } - else if ( size( StorageDevices::FloppyDrives) > 1 ) + else if ( size( StorageDevices::FloppyDrives()) > 1 ) { list<string> drives = (list<string>) maplist ( - map floppy, StorageDevices::FloppyDrives, ``{ + map floppy, StorageDevices::FloppyDrives(), ``{ return floppy["dev_name"]:""; }); Modified: trunk/repair/src/osr_module_partition.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/repair/src/osr_module_partition.ycp?rev=41564&r1=41563&r2=41564&view=diff ============================================================================== --- trunk/repair/src/osr_module_partition.ycp (original) +++ trunk/repair/src/osr_module_partition.ycp Thu Oct 25 13:37:43 2007 @@ -1275,7 +1275,7 @@ UI::NormalCursor(); - if (!StorageDevices::FloppyPresent) + if (!StorageDevices::FloppyPresent()) { // message popup (no floppy drive was detected) Report::Message(_(" -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org