Author: aschnell Date: Thu Feb 19 12:27:52 2009 New Revision: 55606 URL: http://svn.opensuse.org/viewcvs/yast?rev=55606&view=rev Log: - changed type of retval Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/custo... ============================================================================== --- trunk/storage/storage/src/include/custom_part_check_generated.ycp (original) +++ trunk/storage/storage/src/include/custom_part_check_generated.ycp Thu Feb 19 12:27:52 2009 @@ -55,7 +55,6 @@ boolean diskless = true; boolean partition_mounted_but_not_formated = false; - symbol retval = `next; boolean swap_found = false; boolean boot_found = false; boolean root_found = false; @@ -206,6 +205,8 @@ y2milestone("root_dmraid:%1 root_raid %2 boot_raid %3 raid_type:%4", root_dmraid, root_raid, boot_raid, raid_type); + boolean retval = true; + if ( ( !Arch::ia64 () && installation && gpt_warning) || show_all_popups ) { // popup text %2 is a disk name e.g. /dev/hda %1 is a number @@ -220,7 +221,7 @@ deletechars(_("Create New Partition Table"), "&"), deletechars(_("Expert"), "&"))); - if (ret == false) retval = `again; + if (ret == false) retval = false; } @@ -232,7 +233,7 @@ Assign the root mount point "/" to a partition. ")); - retval = `again; + retval = false; } @@ -245,7 +246,7 @@ Use a Linux file system, such as ext3 or reiserfs, for these mount points. ")); - retval = `again; + retval = false; } if( fat_system_boot || show_all_popups ) @@ -255,7 +256,7 @@ Use a Linux file system, such as ext2, ext3 or reiserfs, for this mount point. ")); - retval = `again; + retval = false; } if( (boot_found) && installation || show_all_popups ) @@ -273,7 +274,7 @@ Really use this setup? "),Partitions::BootCyl(),Product::name)); - if ( !ret ) retval = `again; + if ( !ret ) retval = false; } @@ -287,7 +288,7 @@ Really keep this size of boot partition? ")); - if (ret == false) retval = `again; + if (ret == false) retval = false; } } @@ -312,7 +313,7 @@ Really use the setup without /boot partition? ")); - if (ret == false) retval = `again; + if (ret == false) retval = false; } @@ -331,7 +332,7 @@ Really use this setup? "), Partitions::BootCyl(),Product::name)); - if (ret == false) retval = `again; + if (ret == false) retval = false; } } @@ -352,7 +353,7 @@ Really use this setup? "),Product::name)); - if (ret == false) retval = `again; + if (ret == false) retval = false; } // iSeries has no problems with this configuration @@ -374,7 +375,7 @@ Really use this setup? "),Product::name)); - if (ret == false) retval = `again; + if (ret == false) retval = false; } @@ -394,7 +395,7 @@ Really use this setup? "), Partitions::BootMount(),Product::name)); - if (ret == false) retval = `again; + if (ret == false) retval = false; } if( (root_dmraid && !boot_found) || show_all_popups ) @@ -412,7 +413,7 @@ Really use this setup? "), Partitions::BootMount(), Product::name)); - if (ret == false) retval = `again; + if (ret == false) retval = false; } if( ((Partitions::EfiBoot() || Arch::ia64()) && installation && boot_found && gpt_boot_ia64) || @@ -421,7 +422,7 @@ // popup text boolean ret = Popup::YesNo( ia64_gpt_text() + "\n\n" + _("Really use this setup ?") ); - if (ret == false) retval = `again; + if (ret == false) retval = false; } if ( (!swap_found && Stage::initial() && root_fs!=`nfs) || show_all_popups ) @@ -438,7 +439,7 @@ Really use the setup without swap partition? ")); - if (ret == false) retval = `again; + if (ret == false) retval = false; } @@ -471,10 +472,10 @@ boolean ret = Popup::YesNo( message); - if (ret == false) retval = `again; + if (ret == false) retval = false; } - return retval == `next; + return retval; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org