Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at 2014-05-10 08:32:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-storage (Old) and /work/SRC/openSUSE:Factory/.yast2-storage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-storage" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-storage/yast2-storage.changes 2014-05-06 13:40:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-storage.new/yast2-storage.changes 2014-05-10 08:32:16.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 07 18:12:42 CEST 2014 - aschnell@suse.de + +- fixed transition between disk labels in proposal (bnc#875113) +- version 3.1.23 + +------------------------------------------------------------------- Old: ---- yast2-storage-3.1.22.tar.bz2 New: ---- yast2-storage-3.1.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.ps7uOv/_old 2014-05-10 08:32:17.000000000 +0200 +++ /var/tmp/diff_new_pack.ps7uOv/_new 2014-05-10 08:32:17.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.22 +Version: 3.1.23 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-storage-3.1.22.tar.bz2 -> yast2-storage-3.1.23.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.22/doc/README.part.info new/yast2-storage-3.1.23/doc/README.part.info --- old/yast2-storage-3.1.22/doc/README.part.info 2014-05-05 13:54:50.000000000 +0200 +++ new/yast2-storage-3.1.23/doc/README.part.info 2014-05-07 18:29:43.000000000 +0200 @@ -136,7 +136,7 @@ Keyword: sizepct Example: sizepct=30 Description: - This keyword determines that a partiton should be allocated a certain + This keyword determines that a partition should be allocated a certain percentage of the available space for installation on a disk. Keyword: maxsize @@ -163,13 +163,13 @@ Example: disk=2 Description: This keyword specifies which partitions should be placed on which - disks if multiple disks are present in the system. All partions with + disks if multiple disks are present in the system. All partitions with the same disk value will be placed on the same disk. The value after the keyword determines the priority of the partition group. Lower numbers mean higher priority. If there are not enough disks in the system a partition group with lower priority is assigned a separate disks before a partition group with higher priority. A partition - without disk keyword is implicity assigned the highest priority 0. + without disk keyword is implicitly assigned the highest priority 0. Example: PARTITION mount=/var sizepct=100 disk=3 PARTITION mount=/ size=1GB disk=2 @@ -206,7 +206,7 @@ If more than one of the available disks is eligible to hold a certain partition set, the disk is selected as follows. If there is a partition - allocated on that disk that has its size specified by kewords "sizepct" + allocated on that disk that has its size specified by keywords "sizepct" or by "size=0" and does not have a "maxsize" value set then the desired size for this partition is considered to be unlimited. If a partition group contains a partition which an unlimited desired size, the disk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.22/package/yast2-storage.changes new/yast2-storage-3.1.23/package/yast2-storage.changes --- old/yast2-storage-3.1.22/package/yast2-storage.changes 2014-05-05 13:54:50.000000000 +0200 +++ new/yast2-storage-3.1.23/package/yast2-storage.changes 2014-05-07 18:29:43.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 07 18:12:42 CEST 2014 - aschnell@suse.de + +- fixed transition between disk labels in proposal (bnc#875113) +- version 3.1.23 + +------------------------------------------------------------------- Mon May 05 12:04:00 CEST 2014 - aschnell@suse.de - fixed space adjustment in proposal for snapshots (bnc#876127) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.22/package/yast2-storage.spec new/yast2-storage-3.1.23/package/yast2-storage.spec --- old/yast2-storage-3.1.22/package/yast2-storage.spec 2014-05-05 13:54:50.000000000 +0200 +++ new/yast2-storage-3.1.23/package/yast2-storage.spec 2014-05-07 18:29:43.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-storage -Version: 3.1.22 +Version: 3.1.23 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.22/src/clients/inst_target_part.rb new/yast2-storage-3.1.23/src/clients/inst_target_part.rb --- old/yast2-storage-3.1.22/src/clients/inst_target_part.rb 2014-05-05 13:54:50.000000000 +0200 +++ new/yast2-storage-3.1.23/src/clients/inst_target_part.rb 2014-05-07 18:29:43.000000000 +0200 @@ -420,13 +420,13 @@ @ok = create_partitions(@targetMap, @target, @partitions) if !@ok - @reason = _( + reason = _( "Too few partitions are marked for removal or \n" + "the disk is too small. \n" + "To install Linux, select more partitions to \n" + "remove or select a larger disk." ) - display_error_box(@reason) + display_error_box(reason) end @tg = Storage.GetTargetMap @pl = Ops.get_list(@tg, [@target_is, "partitions"], []) @@ -446,10 +446,10 @@ Ops.get_string(p, "mount", "") == "/home" end) == 0 @ok = false - @reason = _( + reason = _( "Not enough space available to propose separate /home." ) - Popup.Error(@reason) + Popup.Error(reason) end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.22/src/include/partitioning/auto_part_create.rb new/yast2-storage-3.1.23/src/include/partitioning/auto_part_create.rb --- old/yast2-storage-3.1.22/src/include/partitioning/auto_part_create.rb 2014-05-05 13:54:50.000000000 +0200 +++ new/yast2-storage-3.1.23/src/include/partitioning/auto_part_create.rb 2014-05-07 18:29:43.000000000 +0200 @@ -1,6 +1,6 @@ # encoding: utf-8 -# Copyright (c) 2012 Novell, Inc. +# Copyright (c) [2012-2014] Novell, Inc. # # All Rights Reserved. # @@ -19,21 +19,17 @@ # To contact Novell about this file by physical or electronic mail, you may # find current contact information at www.novell.com. -# Module: auto_part_create.ycp +# Module: auto_part_create.rb # # Authors: Andreas Schwab (schwab@suse.de) # Klaus Kämpf (kkaempf@suse.de) # -# Purpose: This module creates the neccessary partitions +# Purpose: This module creates the necessary partitions # in the targetMap -# -# $Id$ -# -# used globals -# -# defined functions + module Yast module PartitioningAutoPartCreateInclude + def initialize_partitioning_auto_part_create(include_target) textdomain "storage" @@ -42,6 +38,7 @@ Yast.import "StorageProposal" end + def create_partitions(tgmap, disk, partitions) tgmap = deep_copy(tgmap) disk = deep_copy(disk) @@ -60,8 +57,11 @@ Builtins.y2milestone("create_partitions flex %1 vm %2", has_flex, vm) Ops.set(disk, "partitions", partitions) if StorageProposal.NeedNewDisklabel(disk) - Ops.set(tgmap, [Ops.get_string(disk, "device", ""), "disklabel"], "gpt") - Ops.set(tgmap, [Ops.get_string(disk, "device", ""), "del_ptable"], true) + # TODO understand reason why "label" and "disklabel" are needed + device = disk["device"] + disk["label"] = tgmap[device]["label"] = "gpt" + disk["disklabel"] = tgmap[device]["disklabel"] = "gpt" + disk["del_ptable"] = tgmap[device]["del_ptable"] = true end keep = Builtins.find(partitions) do |p| !Ops.get_boolean(p, "delete", false) && @@ -205,5 +205,6 @@ Builtins.y2milestone("create_partitions ret %1", ret) ret end + end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.22/src/include/partitioning/custom_part_helptexts.rb new/yast2-storage-3.1.23/src/include/partitioning/custom_part_helptexts.rb --- old/yast2-storage-3.1.22/src/include/partitioning/custom_part_helptexts.rb 2014-05-05 13:54:50.000000000 +0200 +++ new/yast2-storage-3.1.23/src/include/partitioning/custom_part_helptexts.rb 2014-05-07 18:29:43.000000000 +0200 @@ -182,14 +182,17 @@ ) end + def ia64_gpt_fix_text _( - "Warning: Your system states that it reqires an EFI \n" + + "Warning: Your system states that it requires an EFI \n" + "boot setup. Since the selected disk does not contain a \n" + "GPT disk label YaST will create a GPT label on this disk.\n" + "\n" + "You need to mark all partitions on this disk for removal.\n" ) end + + end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-3.1.22/src/modules/StorageProposal.rb new/yast2-storage-3.1.23/src/modules/StorageProposal.rb --- old/yast2-storage-3.1.22/src/modules/StorageProposal.rb 2014-05-05 13:54:50.000000000 +0200 +++ new/yast2-storage-3.1.23/src/modules/StorageProposal.rb 2014-05-07 18:29:43.000000000 +0200 @@ -1312,7 +1312,7 @@ !Ops.get_boolean(conf, "prefer_remove", false)) Builtins.y2milestone("do_pflex desperate mode") tc = Builtins.eval(conf) - @cur_mode = :desparate + @cur_mode = :desperate Ops.set(tc, "keep_partition_fsys", []) Ops.set(tc, "keep_partition_id", []) Ops.set(tc, "keep_partition_num", []) @@ -1373,7 +1373,7 @@ Ops.get_list(conf, "partitions", []) ) tc = try_add_boot(conf, e, false) - @cur_mode = :free if @cur_mode != :desparate + @cur_mode = :free if @cur_mode != :desperate if !Ops.get_boolean(tc, "prefer_remove", false) gap = get_gap_info(e, false) tc = add_cylinder_info(tc, gap) @@ -2686,7 +2686,7 @@ ret = Ops.subtract(ret, 100) elsif @cur_mode == :resize ret = Ops.subtract(ret, 1000) - elsif @cur_mode == :desparate + elsif @cur_mode == :desperate ret = Ops.subtract(ret, 1000000) end Builtins.y2milestone("do_weighting after mode ret %1", ret) @@ -4506,9 +4506,9 @@ target = prepare_part_lists(ddev, target) mode = :free while mode != :end && Builtins.size(sol_disk) == 0 - if mode == :free || mode == :desparate + if mode == :free || mode == :desperate valid = Builtins.listmap(ddev) { |s| { s => true } } - if mode == :desparate + if mode == :desperate ddev = get_disk_try_list(target, false) valid = Builtins.listmap(ddev) { |s| { s => true } } target = prepare_part_lists(ddev, target) @@ -4990,11 +4990,11 @@ elsif mode == :remove && Builtins.find(lb) { |v| v } == nil mode = :resize elsif mode == :resize && Builtins.find(lb) { |v| v } == nil - mode = :desparate - elsif mode == :desparate + mode = :desperate + elsif mode == :desperate mode = :end end - if mode == :desparate && Builtins.size(sol_disk) == 0 + if mode == :desperate && Builtins.size(sol_disk) == 0 max_mb = 0 Builtins.foreach(size_mb) do |s, mb| if Ops.greater_than( @@ -5636,9 +5636,9 @@ target = prepare_part_lists(ddev, target) mode = :free while mode != :end && Builtins.size(sol_disk) == 0 - if mode == :free || mode == :desparate + if mode == :free || mode == :desperate valid = Builtins.listmap(ddev) { |s| { s => true } } - if mode == :desparate + if mode == :desperate ddev = get_disk_try_list(target, false) valid = Builtins.listmap(ddev) { |s| { s => true } } target = prepare_part_lists(ddev, target) @@ -5884,8 +5884,8 @@ elsif mode == :remove && Builtins.find(lb) { |v| v } == nil mode = :resize elsif mode == :resize && Builtins.find(lb) { |v| v } == nil - mode = :desparate - elsif mode == :desparate + mode = :desperate + elsif mode == :desperate mode = :end end end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org