Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2013-11-30 19:55:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-11-23 08:13:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2013-11-30 19:55:12.000000000 +0100 @@ -1,0 +2,17 @@ +Thu Nov 28 16:37:19 CET 2013 - [email protected] + +- fix bug where autoyast created primary partition when logical + ones were requested (bnc#852617) + +------------------------------------------------------------------- +Wed Nov 27 18:21:17 CET 2013 - [email protected] + +- automatically install yast2 packages needed for second stage + (e.g. install yast2-users if <users> section in profile) + +------------------------------------------------------------------- +Mon Nov 25 17:24:15 CET 2013 - [email protected] + +- fix bug handling url schemes device: and usb: (bnc#849767) + +------------------------------------------------------------------- @@ -4 +21 @@ -- fix typo in inst_autosetup dor default_target +- fix typo in inst_autosetup for default_target ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2-3.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.2/package/autoyast2.changes new/autoyast2-3.1.2/package/autoyast2.changes --- old/autoyast2-3.1.2/package/autoyast2.changes 2013-11-22 18:15:07.000000000 +0100 +++ new/autoyast2-3.1.2/package/autoyast2.changes 2013-11-28 18:05:28.000000000 +0100 @@ -1,7 +1,24 @@ ------------------------------------------------------------------- +Thu Nov 28 16:37:19 CET 2013 - [email protected] + +- fix bug where autoyast created primary partition when logical + ones were requested (bnc#852617) + +------------------------------------------------------------------- +Wed Nov 27 18:21:17 CET 2013 - [email protected] + +- automatically install yast2 packages needed for second stage + (e.g. install yast2-users if <users> section in profile) + +------------------------------------------------------------------- +Mon Nov 25 17:24:15 CET 2013 - [email protected] + +- fix bug handling url schemes device: and usb: (bnc#849767) + +------------------------------------------------------------------- Fri Nov 22 16:52:00 UTC 2013 - [email protected] -- fix typo in inst_autosetup dor default_target +- fix typo in inst_autosetup for default_target - 3.1.2 ------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.2/src/clients/inst_autosetup.rb new/autoyast2-3.1.2/src/clients/inst_autosetup.rb --- old/autoyast2-3.1.2/src/clients/inst_autosetup.rb 2013-11-22 18:15:07.000000000 +0100 +++ new/autoyast2-3.1.2/src/clients/inst_autosetup.rb 2013-11-28 18:05:28.000000000 +0100 @@ -278,6 +278,10 @@ Progress.NextStage AutoinstSoftware.Import(Ops.get_map(Profile.current, "software", {})) + keys = Profile.current.keys.select do |k| + Profile.current[k].is_a?(Array)||Profile.current[k].is_a?(Hash) + end + AutoinstSoftware.AddYdepsFromProfile(keys) if !AutoinstSoftware.Write Report.Error( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.2/src/include/autoinstall/autopart.rb new/autoyast2-3.1.2/src/include/autoinstall/autopart.rb --- old/autoyast2-3.1.2/src/include/autoinstall/autopart.rb 2013-11-22 18:15:07.000000000 +0100 +++ new/autoyast2-3.1.2/src/include/autoinstall/autopart.rb 2013-11-28 18:05:28.000000000 +0100 @@ -2077,11 +2077,22 @@ # ret = ret - (e["cylinders"]:0 * g["cyl_size"]:1) / (1024*1024*1024); # y2milestone("weight (after rounding): %1", ret); # } - if Ops.get_boolean(e, "extended", false) - ret = Ops.subtract(ret, 1) - if Builtins.size(Ops.get_list(e, "added", [])) == 0 - ret = Ops.subtract(ret, 100) + if e.fetch("extended", false) + ret -= 1 + ret -= 100 if e.fetch("added",[]).empty? + else + index=0 + ps.each do |p| + if p.key?("partition_nr") + ad = e.fetch("added",[]).find { |li| li[0]==index } + if ad && ad[1]!=p["partition_nr"] + Builtins.y2milestone("do_weighting part num mismatch add:%1 ps:%2", ad, p) + ret -= 100 + end + end + index += 1 end + ret -=10 if g.fetch("free_pnr",[]).size<1 end end Builtins.y2milestone("do_weighting weight: %1", ret) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.2/src/include/autoinstall/io.rb new/autoyast2-3.1.2/src/include/autoinstall/io.rb --- old/autoyast2-3.1.2/src/include/autoinstall/io.rb 2013-11-22 18:15:07.000000000 +0100 +++ new/autoyast2-3.1.2/src/include/autoinstall/io.rb 2013-11-28 18:05:28.000000000 +0100 @@ -452,8 +452,13 @@ end Builtins.foreach(deviceList) do |_Host2| Builtins.y2milestone("looking for profile on %1", _Host2) + # this is workaround for bnc#849767 + # because of changes in autoyast startup this code is now + # called much sooner (before Storage stuff is initialized) + # call dummy method to trigger Storage initialization + dummy = Storage.GetUsedFs() mp = Storage.DeviceMounted(Ops.add("/dev/", _Host2)) - already_mounted = !Builtins.isempty(mount_point) + already_mounted = !Builtins.isempty(mp) mount_point = mp if already_mounted Builtins.y2milestone( "already mounted=%1 mountpoint=%2 mp=%3", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.2/src/modules/AutoinstSoftware.rb new/autoyast2-3.1.2/src/modules/AutoinstSoftware.rb --- old/autoyast2-3.1.2/src/modules/AutoinstSoftware.rb 2013-11-22 18:15:07.000000000 +0100 +++ new/autoyast2-3.1.2/src/modules/AutoinstSoftware.rb 2013-11-28 18:05:28.000000000 +0100 @@ -62,6 +62,8 @@ @inst = [] @all_xpatterns = [] + @packagesAvailable = [] + @patternsAvailable = [] @instsource = "" @isolinuxcfg = "" @@ -89,8 +91,8 @@ def Import(settings) settings = deep_copy(settings) @Software = deep_copy(settings) - @patterns = Ops.get_list(settings, "patterns", []) - @instsource = Ops.get_string(settings, "instsource", "") + @patterns = settings.fetch("patterns",[]) + @instsource = settings.fetch("instsource","") notFound = "" @@ -98,17 +100,14 @@ # Packages::Init(true); # Packages::InitializeAddOnProducts(); - packagesAvailable = Pkg.GetPackages(:available, true) - patternsAvailable = [] + @packagesAvailable = Pkg.GetPackages(:available, true) + @patternsAvailable = [] allPatterns = Pkg.ResolvableDependencies("", :pattern, "") allPatterns = Builtins.filter(allPatterns) do |m| - if Ops.get_boolean(m, "user_visible", false) - patternsAvailable = Builtins.add( - patternsAvailable, - Ops.get_string(m, "name", "") - ) + if m.fetch("user_visible",false) + @patternsAvailable.push( m.fetch("name","") ) end - Ops.get_boolean(m, "user_visible", false) + m.fetch("user_visible",false) end regexFound = [] @@ -118,7 +117,7 @@ Builtins.filter(Ops.get_list(settings, "packages", [])) do |want_pack| next true if !Builtins.issubstring(want_pack, "/") want_pack = Builtins.deletechars(want_pack, "/") - Builtins.foreach(packagesAvailable) do |pack| + Builtins.foreach(@packagesAvailable) do |pack| Builtins.y2milestone("matching %1 against %2", pack, want_pack) if Builtins.regexpmatch(pack, want_pack) regexFound = Builtins.add(regexFound, pack) @@ -175,11 +174,11 @@ ) end - PackageAI.toinstall = Ops.get_list(settings, "packages", []) - @kernel = Ops.get_string(settings, "kernel", "") - AutoinstData.post_packages = Ops.get_list(settings, "post-packages", []) - AutoinstData.post_patterns = Ops.get_list(settings, "post-patterns", []) - PackageAI.toremove = Ops.get_list(settings, "remove-packages", []) + PackageAI.toinstall = settings.fetch("packages",[]) + @kernel = settings.fetch("kernel","") + AutoinstData.post_packages = settings.fetch("post-packages", []) + AutoinstData.post_patterns = settings.fetch("post-patterns", []) + PackageAI.toremove = settings.fetch("remove-packages", []) # Imaging # map<string, any> image = settings["system_images"]:$[]; @@ -189,15 +188,35 @@ # modified = false; # else # modified = true; - @image = Ops.get_map(settings, "image", {}) - if Ops.get_string(@image, "image_location", "") != "" && - Ops.get_string(@image, "image_name", "") != "" + @image = settings.fetch("image",{}) + if [email protected]("image_location","").empty? && + [email protected]("image_name","").empty? @imaging = true end - true end + def AddYdepsFromProfile( entries ) + Builtins.y2milestone("AddYdepsFromProfile entries %1", entries) + ign = [ "software", "partitioning", "general", "report", "scripts", "suse_register", + "files", "bootloader", "add-on", "dasd", "zfcp", "timezone" ] + map = { "networking" => "yast2-network" } + entries.reject! { |e| ign.include?(e) } + Builtins.y2milestone("AddYdepsFromProfile entries %1", entries) + pkglist = [] + entries.each do |e| + name = map.has_key?(e) ? map[e] : "yast2-"+e + Builtins.y2milestone("AddYdepsFromProfile name %1 from %2", name, e) + pkglist.push(name) if !pkglist.include?(name) + end + Builtins.y2milestone("AddYdepsFromProfile pkglist %1", pkglist) + pkglist.each do |p| + if( !PackageAI.toinstall.include?(p) && @packagesAvailable.include?(p) ) + PackageAI.toinstall.push(p) + end + end + end + # Constructer def AutoinstSoftware if Stage.cont && Mode.autoinst @@ -1080,6 +1099,7 @@ publish :function => :createISO, :type => "void ()" publish :function => :Export, :type => "map ()" publish :function => :AddModulePackages, :type => "void (list <string>)" + publish :function => :AddYdepsFromProfile, :type => "void (list <string>)" publish :function => :RemoveModulePackages, :type => "void (list <string>)" publish :function => :Summary, :type => "string ()" publish :function => :autoinstPackages, :type => "list <string> ()" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
