Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2015-01-08 23:05:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-12-25 23:19:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2015-01-08 23:05:19.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Dec 30 13:46:52 CET 2014 - [email protected] + +- Selecting needed yast packages for the second stage correctly. + (bnc#909751) +- 3.1.72 + +------------------------------------------------------------------- Old: ---- autoyast2-3.1.71.tar.bz2 New: ---- autoyast2-3.1.72.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.i4QRuF/_old 2015-01-08 23:05:20.000000000 +0100 +++ /var/tmp/diff_new_pack.i4QRuF/_new 2015-01-08 23:05:20.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package autoyast2 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.71 +Version: 3.1.72 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ autoyast2-3.1.71.tar.bz2 -> autoyast2-3.1.72.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.71/package/autoyast2.changes new/autoyast2-3.1.72/package/autoyast2.changes --- old/autoyast2-3.1.71/package/autoyast2.changes 2014-12-23 12:04:14.000000000 +0100 +++ new/autoyast2-3.1.72/package/autoyast2.changes 2015-01-07 16:19:10.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Dec 30 13:46:52 CET 2014 - [email protected] + +- Selecting needed yast packages for the second stage correctly. + (bnc#909751) +- 3.1.72 + +------------------------------------------------------------------- Tue Dec 23 10:56:30 CET 2014 - [email protected] - Setting normal mode while applying single module settings to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.71/package/autoyast2.spec new/autoyast2-3.1.72/package/autoyast2.spec --- old/autoyast2-3.1.71/package/autoyast2.spec 2014-12-23 12:04:14.000000000 +0100 +++ new/autoyast2-3.1.72/package/autoyast2.spec 2015-01-07 16:19:10.000000000 +0100 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.71 +Version: 3.1.72 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.71/src/bin/fetch_image.sh new/autoyast2-3.1.72/src/bin/fetch_image.sh --- old/autoyast2-3.1.71/src/bin/fetch_image.sh 2014-12-23 12:04:14.000000000 +0100 +++ new/autoyast2-3.1.72/src/bin/fetch_image.sh 2015-01-07 16:19:10.000000000 +0100 @@ -14,29 +14,27 @@ exit $? fi; -# catch http, https, ftp and tftp -if [[ "x$LOCATION" =~ ^x..?tp ]]; then - wget -O - $LOCATION 2>/dev/null | tar xfz - -C /mnt -fi; - -if [[ "$LOCATION" =~ ^nfs ]]; then -# FIXME - mkdir -p /tmp/image_mount -fi; - -if [[ "x$LOCATION" =~ ^xfile ]]; then - LOCATION=`echo $LOCATION|sed 's|file://||'`; - if [ ! -e "$LOCATION" ]; then - DEVICE=`grep ^Device: /etc/install.inf | awk '{ print $2 }'` - mkdir -p /tmp/instsource - mount /dev/$DEVICE /tmp/instsource - tar xfz /tmp/instsource/$LOCATION -C /mnt - umount /tmp/instsource - else - tar xfz /tmp/instsource/$LOCATION -C /mnt - fi; -fi; - +case "$LOCATION" in + # catch http, https, ftp and tftp + http:*|https:*|ftp:*|tftp:*) + wget -O - $LOCATION 2>/dev/null | tar xfz - -C /mnt + ;; + nfs:*) + # FIXME + mkdir -p /tmp/image_mount + ;; + file:*) + LOCATION=`echo $LOCATION|sed 's|file://||'` + if [ ! -e "$LOCATION" ]; then + DEVICE=`grep ^Device: /etc/install.inf | awk '{ print $2 }'` + mkdir -p /tmp/instsource + mount /dev/$DEVICE /tmp/instsource + tar xfz /tmp/instsource/$LOCATION -C /mnt + umount /tmp/instsource + else + tar xfz /tmp/instsource/$LOCATION -C /mnt + fi + ;; +esac mv /tmp/fstab /mnt/etc - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.71/src/modules/AutoinstSoftware.rb new/autoyast2-3.1.72/src/modules/AutoinstSoftware.rb --- old/autoyast2-3.1.71/src/modules/AutoinstSoftware.rb 2014-12-23 12:04:14.000000000 +0100 +++ new/autoyast2-3.1.72/src/modules/AutoinstSoftware.rb 2015-01-07 16:19:10.000000000 +0100 @@ -11,6 +11,7 @@ module Yast class AutoinstSoftwareClass < Module + include Yast::Logger def main Yast.import "UI" Yast.import "Pkg" @@ -30,6 +31,7 @@ Yast.import "Mode" Yast.import "Misc" Yast.import "Directory" + Yast.import "Y2ModuleConfig" Yast.include self, "autoinstall/io.rb" @@ -201,16 +203,24 @@ 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) + yast_module, _entry = Y2ModuleConfig.ModuleMap.find do |module_name, entry| + module_name == e || + entry["X-SuSE-YaST-AutoInstResource"] == e || + (entry["X-SuSE-YaST-AutoInstMerge"] && entry["X-SuSE-YaST-AutoInstMerge"].split(",").include?(e)) + end + yast_module ||= e # if needed taking default because no entry has been defined in the *.desktop file + provide = "application(YaST2/#{yast_module}.desktop)" + + packages = Pkg.PkgQueryProvides( provide ) + unless packages.empty? + name = packages[0][0] + log.info "AddYdepsFromProfile add package #{name} for entry #{e}" + pkglist.push(name) if !pkglist.include?(name) + else + log.info "No package provides: #{provide}" + end end Builtins.y2milestone("AddYdepsFromProfile pkglist %1", pkglist) pkglist.each do |p| -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
