Hello community,
here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2014-08-30 16:03:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-08-20 17:54:00.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2014-08-30 16:03:45.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Aug 25 08:59:22 CEST 2014 - schubi(a)suse.de
+
+- Making "second_stage" public in order to switch off second stage
+ installation completely. Needed for bnc#886464 and bnc#892091
+- 3.1.57
+
+-------------------------------------------------------------------
Old:
----
autoyast2-3.1.56.tar.bz2
New:
----
autoyast2-3.1.57.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.W6P1Bw/_old 2014-08-30 16:03:47.000000000 +0200
+++ /var/tmp/diff_new_pack.W6P1Bw/_new 2014-08-30 16:03:47.000000000 +0200
@@ -17,7 +17,7 @@
Name: autoyast2
-Version: 3.1.56
+Version: 3.1.57
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ autoyast2-3.1.56.tar.bz2 -> autoyast2-3.1.57.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.56/package/autoyast2.changes new/autoyast2-3.1.57/package/autoyast2.changes
--- old/autoyast2-3.1.56/package/autoyast2.changes 2014-08-20 11:05:17.000000000 +0200
+++ new/autoyast2-3.1.57/package/autoyast2.changes 2014-08-25 10:40:16.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Mon Aug 25 08:59:22 CEST 2014 - schubi(a)suse.de
+
+- Making "second_stage" public in order to switch off second stage
+ installation completely. Needed for bnc#886464 and bnc#892091
+- 3.1.57
+
+-------------------------------------------------------------------
Wed Aug 20 10:38:19 CEST 2014 - schubi(a)suse.de
- chroot-scripts: Install script into the chroot environment if it
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.56/package/autoyast2.spec new/autoyast2-3.1.57/package/autoyast2.spec
--- old/autoyast2-3.1.56/package/autoyast2.spec 2014-08-20 11:05:17.000000000 +0200
+++ new/autoyast2-3.1.57/package/autoyast2.spec 2014-08-25 10:40:16.000000000 +0200
@@ -17,7 +17,7 @@
Name: autoyast2
-Version: 3.1.56
+Version: 3.1.57
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.56/src/clients/inst_autosetup.rb new/autoyast2-3.1.57/src/clients/inst_autosetup.rb
--- old/autoyast2-3.1.56/src/clients/inst_autosetup.rb 2014-08-20 11:05:17.000000000 +0200
+++ new/autoyast2-3.1.57/src/clients/inst_autosetup.rb 2014-08-25 10:40:16.000000000 +0200
@@ -379,7 +379,6 @@
)
# AutoInstall::PXELocalBoot();
- AutoInstall.TurnOff
Progress.Finish
@ret = ProductControl.RunFrom(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.56/src/clients/inst_autosetup_upgrade.rb new/autoyast2-3.1.57/src/clients/inst_autosetup_upgrade.rb
--- old/autoyast2-3.1.56/src/clients/inst_autosetup_upgrade.rb 2014-08-20 11:05:17.000000000 +0200
+++ new/autoyast2-3.1.57/src/clients/inst_autosetup_upgrade.rb 2014-08-25 10:40:16.000000000 +0200
@@ -458,7 +458,6 @@
false
)
- AutoInstall.TurnOff
Progress.Finish
@ret = ProductControl.RunFrom(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.56/src/modules/AutoInstall.rb new/autoyast2-3.1.57/src/modules/AutoInstall.rb
--- old/autoyast2-3.1.56/src/modules/AutoInstall.rb 2014-08-20 11:05:17.000000000 +0200
+++ new/autoyast2-3.1.57/src/modules/AutoInstall.rb 2014-08-25 10:40:16.000000000 +0200
@@ -301,30 +301,6 @@
true
end
- # Turn off the second stage of autoyast
- #
- def TurnOff
- if !Ops.get_boolean(
- Profile.current,
- ["general", "mode", "second_stage"],
- true
- )
- Builtins.y2milestone(
- "switching from autoinstallation to manual installation in second stage"
- )
- SCR.Execute(
- path(".target.bash"),
- "/bin/grep -v -i '^autoyast:' /etc/install.inf > /tmp/install.inf.new"
- )
- SCR.Execute(
- path(".target.bash"),
- "/bin/mv /tmp/install.inf.new /etc/install.inf"
- )
- end
-
- nil
- end
-
publish :variable => :autoconf, :type => "boolean"
publish :function => :callbackTrue_boolean_string, :type => "boolean (string)"
publish :function => :callbackFalse_boolean_string, :type => "boolean (string)"
@@ -348,7 +324,6 @@
publish :function => :Save, :type => "boolean ()"
publish :function => :Finish, :type => "void (string)"
publish :function => :PXELocalBoot, :type => "boolean ()"
- publish :function => :TurnOff, :type => "boolean ()"
end
AutoInstall = AutoInstallClass.new
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.56/src/modules/AutoinstConfig.rb new/autoyast2-3.1.57/src/modules/AutoinstConfig.rb
--- old/autoyast2-3.1.56/src/modules/AutoinstConfig.rb 2014-08-20 11:05:17.000000000 +0200
+++ new/autoyast2-3.1.57/src/modules/AutoinstConfig.rb 2014-08-25 10:40:16.000000000 +0200
@@ -148,6 +148,8 @@
#
@Confirm = true
+ # Running autoyast second_stage
+ @second_stage = true
@OriginalURI = ""
@@ -497,6 +499,7 @@
publish :variable => :pass, :type => "string"
publish :variable => :default_target, :type => "string"
publish :variable => :Confirm, :type => "boolean"
+ publish :variable => :second_stage, :type => "boolean"
publish :variable => :OriginalURI, :type => "string"
publish :variable => :message, :type => "string"
publish :variable => :dontmerge, :type => "list <string>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.56/src/modules/AutoinstGeneral.rb new/autoyast2-3.1.57/src/modules/AutoinstGeneral.rb
--- old/autoyast2-3.1.56/src/modules/AutoinstGeneral.rb 2014-08-20 11:05:17.000000000 +0200
+++ new/autoyast2-3.1.57/src/modules/AutoinstGeneral.rb 2014-08-25 10:40:16.000000000 +0200
@@ -37,6 +37,9 @@
#
@Confirm = true
+ # Running autoyast second_stage
+ @second_stage = true
+
#
# Mode Settings
#
@@ -384,6 +387,7 @@
# @return [Boolean] true on success
def Write
AutoinstConfig.Confirm = Ops.get_boolean(@mode, "confirm", true)
+ AutoinstConfig.second_stage = @mode["second_stage"] if @mode.has_key?("second_stage")
if Builtins.haskey(@mode, "forceboot")
ProductFeatures.SetBooleanFeature(
"globals",
@@ -424,6 +428,7 @@
end
publish :variable => :Confirm, :type => "boolean"
+ publish :variable => :second_stage, :type => "boolean"
publish :variable => :mode, :type => "map"
publish :variable => :signature_handling, :type => "map"
publish :variable => :askList, :type => "list"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.56/src/modules/AutoinstSoftware.rb new/autoyast2-3.1.57/src/modules/AutoinstSoftware.rb
--- old/autoyast2-3.1.56/src/modules/AutoinstSoftware.rb 2014-08-20 11:05:18.000000000 +0200
+++ new/autoyast2-3.1.57/src/modules/AutoinstSoftware.rb 2014-08-25 10:40:16.000000000 +0200
@@ -189,8 +189,11 @@
# else
# modified = true;
@image = settings.fetch("image",{})
- if !(a)image.fetch("image_location","").empty? &&
- !(a)image.fetch("image_name","").empty?
+
+ # image_location and image_name are not mandatory for
+ # extracting an image because it can be defined in the
+ # script too. So it will not be checked here.
+ if @image["script_location"] && !@image["script_location"].empty?
@imaging = true
end
true
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
