Skip to content

Commit

Permalink
Merge d6ebcd0 into 18dfec6
Browse files Browse the repository at this point in the history
  • Loading branch information
imobachgs committed Nov 27, 2019
2 parents 18dfec6 + d6ebcd0 commit 49be0f8
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
8 changes: 8 additions & 0 deletions package/autoyast2.changes
@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Nov 27 15:28:20 UTC 2019 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>

- Consider extended partitions when trying to figure out whether
the partitioning layout described in the profile fits
(bsc#1156567).
- 3.2.32.5

-------------------------------------------------------------------
Tue Jul 16 10:28:46 UTC 2019 - José Iván López González <jlopez@suse.com>

Expand Down
2 changes: 1 addition & 1 deletion package/autoyast2.spec
Expand Up @@ -17,7 +17,7 @@


Name: autoyast2
Version: 3.2.32.4
Version: 3.2.32.5
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build
Expand Down
12 changes: 5 additions & 7 deletions src/include/autoinstall/autopart.rb
Expand Up @@ -1527,16 +1527,14 @@ def get_perfect_list(ps, g)

new_ps = ps.count { |p| p.fetch("create", true) }
reuse_ps = ps.count { |p| p.fetch("partition_nr",0)==p.fetch("usepart",-1) }
free_pnr = g.fetch("free_pnr",[]).size
if g.fetch("extended_possible",false)
free_pnr -= 1
free_pnr += g.fetch("ext_pnr",[]).size
end
sum_free_parts = g.fetch("free_pnr",[]).size + g.fetch("ext_pnr", []).size
sum_free_parts -= 1 if g.fetch("extended_possible",false)

Builtins.y2milestone(
"get_perfect_list: size(ps):%1 new_ps:%2 reuse_ps:%3 sum_free:%4",
ps.size, new_ps, reuse_ps, free_pnr
ps.size, new_ps, reuse_ps, sum_free_parts
)
if (new_ps>0||reuse_ps>0) && g.fetch("gap", []).size>0 && new_ps<=free_pnr
if (new_ps>0||reuse_ps>0) && g.fetch("gap", []).size>0 && new_ps<=sum_free_parts
lg = Builtins.eval(g)

# prepare local gap var
Expand Down

0 comments on commit 49be0f8

Please sign in to comment.