Hello community,
here is the log from the commit of package autoyast2 for openSUSE:Factory
checked in at 2013-12-17 10:00:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old)
and /work/SRC/openSUSE:Factory/.autoyast2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autoyast2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2013-12-04
12:21:54.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2013-12-17
10:00:23.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Dec 9 17:55:21 CET 2013 - f...@suse.de
+
+- Fix problem with reusing existing partitions (bnc#854439)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.BFk7ZU/_old 2013-12-17 10:00:24.000000000 +0100
+++ /var/tmp/diff_new_pack.BFk7ZU/_new 2013-12-17 10:00:24.000000000 +0100
@@ -25,7 +25,7 @@
Source1: autoyast_en_html.tar.bz2
BuildRequires: update-desktop-files
-BuildRequires: yast2-devtools
+BuildRequires: yast2-devtools >= 3.1.10
# /usr/share/YaST2/control/control.rng
BuildRequires: yast2-installation
# xmllint
++++++ autoyast2-3.1.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-3.1.3/VERSION new/autoyast2-3.1.3/VERSION
--- old/autoyast2-3.1.3/VERSION 2013-12-03 16:05:03.000000000 +0100
+++ new/autoyast2-3.1.3/VERSION 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-3.1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-3.1.3/package/autoyast2.changes
new/autoyast2-3.1.3/package/autoyast2.changes
--- old/autoyast2-3.1.3/package/autoyast2.changes 2013-12-03
16:05:03.000000000 +0100
+++ new/autoyast2-3.1.3/package/autoyast2.changes 2013-12-13
15:39:53.000000000 +0100
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Mon Dec 9 17:55:21 CET 2013 - f...@suse.de
+
+- Fix problem with reusing existing partitions (bnc#854439)
+
+-------------------------------------------------------------------
Tue Dec 3 14:45:40 UTC 2013 - vmora...@suse.com
- Support legacy runlevel profile
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-3.1.3/package/autoyast2.spec
new/autoyast2-3.1.3/package/autoyast2.spec
--- old/autoyast2-3.1.3/package/autoyast2.spec 2013-12-03 16:05:03.000000000
+0100
+++ new/autoyast2-3.1.3/package/autoyast2.spec 2013-12-13 15:39:53.000000000
+0100
@@ -27,7 +27,8 @@
Group: System/YaST
License: GPL-2.0
Source1: autoyast_en_html.tar.bz2
-BuildRequires: yast2-devtools update-desktop-files
+BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: update-desktop-files
# /usr/share/YaST2/control/control.rng
BuildRequires: yast2-installation
# xmllint
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-3.1.3/src/include/autoinstall/autopart.rb
new/autoyast2-3.1.3/src/include/autoinstall/autopart.rb
--- old/autoyast2-3.1.3/src/include/autoinstall/autopart.rb 2013-12-03
16:05:03.000000000 +0100
+++ new/autoyast2-3.1.3/src/include/autoinstall/autopart.rb 2013-12-13
15:39:53.000000000 +0100
@@ -1,6 +1,6 @@
# encoding: utf-8
-# File: modules/AutoinstStorage.ycp
+# File: include/autoinstall/autpart.rb
# Module: Auto-Installation
# Summary: Storage
# Authors: Anas Nashif <nas...@suse.de>
@@ -1452,25 +1452,18 @@
# extended is not possible and number of requested partitions is less
than all
# available primaries and logical slots )
- new_ps = Builtins.size(
- Builtins.filter(
- Convert.convert(ps, :from => "list", :to => "list <map>")
- ) { |p| Ops.get_boolean(p, "create", true) }
- )
- free_pnr = Builtins.size(Ops.get_list(g, "free_pnr", []))
- if Ops.get_boolean(g, "extended_possible", false)
- free_pnr = Ops.add(
- Ops.subtract(free_pnr, 1),
- Builtins.size(Ops.get_list(g, "ext_pnr", []))
- )
+ 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
Builtins.y2milestone(
- "get_perfect_list: size(ps):%1 new_ps:%2 sum_free:%3",
- Builtins.size(ps),
- new_ps,
- free_pnr
+ "get_perfect_list: size(ps):%1 new_ps:%2 reuse_ps:%3 sum_free:%4",
+ ps.size, new_ps, reuse_ps, free_pnr
)
- if new_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<=free_pnr
lg = Builtins.eval(g)
# prepare local gap var
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-3.1.3/src/modules/Profile.rb
new/autoyast2-3.1.3/src/modules/Profile.rb
--- old/autoyast2-3.1.3/src/modules/Profile.rb 2013-12-03 16:05:03.000000000
+0100
+++ new/autoyast2-3.1.3/src/modules/Profile.rb 2013-12-13 15:39:53.000000000
+0100
@@ -35,10 +35,6 @@
@ModuleMap = {}
- @Version = ""
-
- @Description = ""
-
@changed = false
@prepare = true
@@ -59,12 +55,6 @@
end
- # Detect Version
- # @return [String]
- def DetectVersion
- ""
- end
-
# compatibility to new storage lib in 10.0
def storageLibCompat
newPart = []
@@ -277,21 +267,13 @@
# Read Profile properties and Version
# @param map Profile Properties
# @return [void]
- def ReadProperties(properties)
- properties = deep_copy(properties)
- @Version = Ops.get_string(properties, "version", "")
- @Description = Ops.get_string(properties, "description", "")
-
- if @Version != "3.0" || @Version == ""
- @Version = DetectVersion()
- if @Version == ""
- Builtins.y2milestone("Can't detect Profile Version")
- return
- end
+ def check_version(properties)
+ version = properties["version"]
+ if version != "3.0"
+ Builtins.y2milestone("Wrong profile version '#{version}'")
else
- Builtins.y2milestone("AutoYaST Profile Version %1 Detected.",
@Version)
+ Builtins.y2milestone("AutoYaST Profile Version %1 Detected.", version)
end
- nil
end
@@ -304,7 +286,7 @@
Builtins.y2milestone("importing profile")
@current = deep_copy(profile)
- ReadProperties(Ops.get_map(@current, "properties", {}))
+ check_version(Ops.get_map(@current, "properties", {}))
# old style
if Builtins.haskey(profile, "configure") ||
@@ -329,10 +311,6 @@
)
end
- # should not be needed anymore with new libsax
- #if (!current["x11", "configure_x11"]:false)
- # ProductControl::DisableModule ("x11");
-
# raise the network immediately after configuring it
if Builtins.haskey(@current, "networking") &&
!Builtins.haskey(
@@ -690,10 +668,6 @@
# @param path to file
# @return [Boolean]
def ReadXML(file)
- # does not work here
- #if ( !FileUtils::Exists( file ) )
- # return false;
-
tmp = Convert.to_string(SCR.Read(path(".target.string"), file))
l = Builtins.splitstring(tmp, "\n")
if tmp != nil && Ops.get(l, 0, "") == "-----BEGIN PGP MESSAGE-----"
@@ -732,7 +706,6 @@
# FIXME: rethink and check for sanity of that!
# save decrypted profile for modifying pre-scripts
if Stage.initial
- #SCR::Write(.target.string,
AutoinstConfig::profile_dir+"/autoinst.xml", out["stdout"]:"");
SCR.Write(
path(".target.string"),
file,
@@ -871,12 +844,8 @@
publish :variable => :current, :type => "map <string, any>"
publish :variable => :ModuleMap, :type => "map <string, map>"
- publish :variable => :Version, :type => "string"
publish :variable => :changed, :type => "boolean"
publish :variable => :prepare, :type => "boolean"
- publish :function => :Profile, :type => "void ()"
- publish :function => :generalCompat, :type => "void ()"
- publish :function => :ReadProperties, :type => "void (map)"
publish :function => :Import, :type => "void (map <string, any>)"
publish :function => :Prepare, :type => "void ()"
publish :function => :Reset, :type => "void ()"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
