Author: aschnell
Date: Mon Dec 7 12:59:17 2009
New Revision: 59976
URL: http://svn.opensuse.org/viewcvs/yast?rev=59976&view=rev
Log:
- make StorageDevices::Probe() return map
Modified:
trunk/storage/storage/src/modules/Storage.ycp
trunk/storage/storage/src/modules/StorageDevices.ycp
Modified: trunk/storage/storage/src/modules/Storage.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=59976&r1=59975&r2=59976&view=diff
==============================================================================
--- trunk/storage/storage/src/modules/Storage.ycp (original)
+++ trunk/storage/storage/src/modules/Storage.ycp Mon Dec 7 12:59:17 2009
@@ -3087,7 +3087,7 @@
map bios_id_raid = $[];
y2milestone ("probing StorageDevices" );
map rename = $[];
- tmp = (map)StorageDevices::Probe(true);
+ tmp = StorageDevices::Probe(true);
foreach( string dev, map disk, tmp,
``{
map dtmp = Storage::GetDiskPartitionTg( dev, $[] )[0]:$[];
Modified: trunk/storage/storage/src/modules/StorageDevices.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageDevices.ycp?rev=59976&r1=59975&r2=59976&view=diff
==============================================================================
--- trunk/storage/storage/src/modules/StorageDevices.ycp (original)
+++ trunk/storage/storage/src/modules/StorageDevices.ycp Mon Dec 7 12:59:17 2009
@@ -374,19 +374,20 @@
* @return map TargetMap
*/
-global define map fakeProbe ()
- ``{
+map fakeProbe()
+ {
string fake_map_file = ( Mode::test () ? "demo_target_map.ycp" : "test_target_map.ycp" );
y2milestone( "%1 mode - using fake target map from %2",
Mode::test () ? "Demo" : "Test", fake_map_file );
- map target_map = (map) SCR::Read( .target.yast2, fake_map_file );
+ map target_map = (map) SCR::Read( .target.yast2, fake_map_file );
y2debug( "Fake target map: %1", target_map );
return target_map;
- } // fakeProbe()
+ }
+
global boolean FloppyPresent()
{
@@ -416,8 +417,8 @@
* @return map TargetMap
*/
-define map localProbe()
- ``{
+map localProbe()
+ {
map targets = $[];
if( Mode::test () )
{
@@ -433,7 +434,7 @@
{
// somehow, we couldn't find any harddisks for installation.
// This is a fatal error, we can't do anything about it
- return targets;
+ return (map) targets;
}
// loop over all_disks, constructing targets map
@@ -614,7 +615,7 @@
y2milestone( "localProbe: FloppyDrives %1", FloppyDrives() );
y2milestone( "localProbe: ZipDrives %1", ZipDrives() );
- return targets;
+ return (map) targets;
}
/*
@@ -625,16 +626,16 @@
* @param boolean force_reset
*/
-global define map Probe(boolean force_reset)
- ``{
- map target = $[];
+global map Probe(boolean force_reset)
+ {
+ map target = $[];
y2milestone( "Probe force_reset:%1 disks_valid:%2", force_reset, disks_valid );
if( force_reset )
targetMapSize = 0;
if( targetMapSize==0 && disks_valid )
{
- target = localProbe();
+ target = (map) localProbe();
targetMapSize = size(target);
ProbeCDROMs();
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
