Mailinglist Archive: yast-commit (1271 mails)

< Previous Next >
[yast-commit] [ci_new_pac] JFYI yast2-add-on -> sle12
Script 'mail_helper' called by ro
Hello packager,

This is just FYI. Your package was checked in in distribution "sle12"
by autobuild-member: ro.

Here comes the log...

---------------------------%<------------------------------
Hi,

here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-add-on ->
sle12



## BNC# 893103 : "Inconsistent order when going back from "Suggested
Partitioning" to "Add-On Product"" (RESOLVED/FIXED)

Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-add-on/yast2-add-on.changes 2014-06-03
13:50:32.000000000 +0200
+++ /mounts/work_src_done/SLE12/yast2-add-on/yast2-add-on.changes
2014-09-01 11:34:35.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Sep 1 09:09:40 UTC 2014 - jreidinger@xxxxxxxx
+
+- make add-ons dialog consistent when going back (bnc#893103)
+- 3.1.9
+
+-------------------------------------------------------------------

calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-add-on
- yast2-schema
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-add-on (Old)
and /mounts/work_src_done/SLE12/yast2-add-on (BS:build ID:43299
MAIL:yast-commit@xxxxxxxxxxxx) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-add-on", Maintainer is "yast-commit@xxxxxxxxxxxx"


Old:
----
yast2-add-on-3.1.8.tar.bz2

New:
----
yast2-add-on-3.1.9.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-add-on.spec ++++++
--- /var/tmp/diff_new_pack.SV63vg/_old 2014-09-01 16:18:01.000000000 +0200
+++ /var/tmp/diff_new_pack.SV63vg/_new 2014-09-01 16:18:01.000000000 +0200
@@ -17,7 +17,7 @@


Name: yast2-add-on
-Version: 3.1.8
+Version: 3.1.9
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build

++++++ yast2-add-on-3.1.8.tar.bz2 -> yast2-add-on-3.1.9.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-3.1.8/package/yast2-add-on.changes
new/yast2-add-on-3.1.9/package/yast2-add-on.changes
--- old/yast2-add-on-3.1.8/package/yast2-add-on.changes 2014-06-03
10:41:35.000000000 +0200
+++ new/yast2-add-on-3.1.9/package/yast2-add-on.changes 2014-09-01
11:29:16.000000000 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Sep 1 09:09:40 UTC 2014 - jreidinger@xxxxxxxx
+
+- make add-ons dialog consistent when going back (bnc#893103)
+- 3.1.9
+
+-------------------------------------------------------------------
Mon Jun 2 16:49:24 UTC 2014 - jreidinger@xxxxxxxx

- always set correct state for add-on add checkbox dialog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-add-on-3.1.8/package/yast2-add-on.spec
new/yast2-add-on-3.1.9/package/yast2-add-on.spec
--- old/yast2-add-on-3.1.8/package/yast2-add-on.spec 2014-06-03
10:41:35.000000000 +0200
+++ new/yast2-add-on-3.1.9/package/yast2-add-on.spec 2014-09-01
11:29:16.000000000 +0200
@@ -17,7 +17,7 @@


Name: yast2-add-on
-Version: 3.1.8
+Version: 3.1.9
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-add-on-3.1.8/src/include/add-on/add-on-workflow.rb
new/yast2-add-on-3.1.9/src/include/add-on/add-on-workflow.rb
--- old/yast2-add-on-3.1.8/src/include/add-on/add-on-workflow.rb
2014-06-03 10:41:36.000000000 +0200
+++ new/yast2-add-on-3.1.9/src/include/add-on/add-on-workflow.rb
2014-09-01 11:29:16.000000000 +0200
@@ -48,8 +48,6 @@
Yast.include include_target, "packager/repositories_include.rb"
Yast.include include_target, "add-on/misc.rb"

- @going_back_in_workflow = GetInstArgs.going_back
-
# Used for adding sources
@createResult = :again

@@ -1072,12 +1070,10 @@
end

# FATE #301928 - Saving one click
- # Bugzilla #305809 if "going_back", do not save that click!
- if no_addons && !@going_back_in_workflow
+ # Bugzilla #893103 be consistent, so always when there is no add-on skip
+ if no_addons
Builtins.y2milestone("Skipping to media_select")
- # only once
- @going_back_in_workflow = false
- ret = :first_time
+ ret = :skip_to_add
end

# Show Add-Ons table
@@ -1097,7 +1093,7 @@
some_addon_changed = false
begin
# FATE #301928 - Saving one click
- ret = Convert.to_symbol(UI.UserInput) unless ret == :first_time
+ ret = Convert.to_symbol(UI.UserInput) unless ret == :skip_to_add

# aborting
if ret == :abort || ret == :cancel
@@ -1146,11 +1142,11 @@
)

# adding new add-on
- elsif ret == :add || ret == :first_time
+ elsif ret == :add || ret == :skip_to_add
# show checkbox only first time in installation when there is no
# other addons, so allow to quickly skip adding addons, otherwise
# it make no sense as user explicitelly want add addon
- SourceDialogs.display_addon_checkbox = ret == :first_time
+ SourceDialogs.display_addon_checkbox = ret == :skip_to_add

# bugzilla #293428
# Release all sources before adding a new one
@@ -1175,7 +1171,7 @@
AddOnProduct.PrepareForRegistration(AddOnProduct.src_id)
some_addon_changed = true
# do not keep first_time, otherwise summary won't be shown during
installation
- ret = nil if ret == :first_time
+ ret = nil if ret == :skip_to_add
elsif ret2 == :abort || ret2 == :cancel
Builtins.y2milestone("Add-on sequence aborted")

@@ -1196,9 +1192,9 @@
end
end
# properly return abort in installation
- ret = :abort if ret == :first_time
+ ret = :abort if ret == :skip_to_add
# extra handling for the global enable checkbox
- elsif ret == :first_time
+ elsif ret == :skip_to_add
ret = :back if ret2 == :back
ret = :next if ret2 == :skip
end

continue with "q"...


Checked in at Mon Sep 1 16:18:11 CEST 2014 by ro

Remember to have fun...

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages