Hello community,

here is the log from the commit of package yast2-packager for openSUSE:Factory 
checked in at 2019-02-04 16:09:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-packager.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-packager"

Mon Feb  4 16:09:09 2019 rev:363 rq:670055 version:4.1.25

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes    
2019-01-05 14:40:32.744572563 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-packager.new.28833/yast2-packager.changes 
2019-02-04 16:09:12.998017770 +0100
@@ -1,0 +2,7 @@
+Tue Jan 29 08:08:04 UTC 2019 - [email protected]
+
+- Change wording of the popup that asks to enable online repos
+  (related to bsc#1112937).
+- 4.1.25
+
+-------------------------------------------------------------------

Old:
----
  yast2-packager-4.1.24.tar.bz2

New:
----
  yast2-packager-4.1.25.tar.bz2

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

Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.DY02KI/_old  2019-02-04 16:09:14.502016831 +0100
+++ /var/tmp/diff_new_pack.DY02KI/_new  2019-02-04 16:09:14.502016831 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-packager
-Version:        4.1.24
+Version:        4.1.25
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ yast2-packager-4.1.24.tar.bz2 -> yast2-packager-4.1.25.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-packager-4.1.24/package/yast2-packager.changes 
new/yast2-packager-4.1.25/package/yast2-packager.changes
--- old/yast2-packager-4.1.24/package/yast2-packager.changes    2019-01-03 
13:56:53.000000000 +0100
+++ new/yast2-packager-4.1.25/package/yast2-packager.changes    2019-01-30 
08:17:29.000000000 +0100
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Tue Jan 29 08:08:04 UTC 2019 - [email protected]
+
+- Change wording of the popup that asks to enable online repos
+  (related to bsc#1112937).
+- 4.1.25
+
+-------------------------------------------------------------------
 Thu Dec 27 17:29:32 UTC 2018 - [email protected]
 
 - Display the license agreement checkbox only when needed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-packager-4.1.24/package/yast2-packager.spec 
new/yast2-packager-4.1.25/package/yast2-packager.spec
--- old/yast2-packager-4.1.24/package/yast2-packager.spec       2019-01-03 
13:56:53.000000000 +0100
+++ new/yast2-packager-4.1.25/package/yast2-packager.spec       2019-01-30 
08:17:29.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-packager
-Version:        4.1.24
+Version:        4.1.25
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-packager-4.1.24/src/lib/y2packager/clients/inst_productsources.rb 
new/yast2-packager-4.1.25/src/lib/y2packager/clients/inst_productsources.rb
--- old/yast2-packager-4.1.24/src/lib/y2packager/clients/inst_productsources.rb 
2019-01-03 13:56:53.000000000 +0100
+++ new/yast2-packager-4.1.25/src/lib/y2packager/clients/inst_productsources.rb 
2019-01-30 08:17:29.000000000 +0100
@@ -1725,6 +1725,7 @@
     # @return Boolean
     #
     def ask_activate_online_repos
+      msg = []
       if GetInstArgs.going_back && @@ask_activate_online_repos_result == false
         # If the user previously answered "no" and he is now going back, give
         # him a chance to change his mind when he comes here the next time
@@ -1738,25 +1739,28 @@
       # Ask only once
       return @@ask_activate_online_repos_result unless 
@@ask_activate_online_repos_result.nil?
 
-      default_button = :focus_yes
-      msg = _("Your system has an active network connection.\n" \
-              "Additional software is available online.\n"      \
-              "Would you like to activate online repositories?")
+      msg << _("The system has an active network connection.\n" \
+              "Additional software is available online.")
 
       if low_memory?
-        msg += "\n\n"
-        msg += _("Since your system has less than %d MiB memory,\n"        \
+        msg << _("Since the system has less than %d MiB memory,\n"         \
                  "there is a significant risk of running out of memory,\n" \
                  "and the installer may crash or freeze.\n"                \
                  "\n"                                                      \
                  "Using the online repositories later in the installed\n"  \
                  "system is recommended.") % LOW_MEMORY_MIB
-        default_button = :focus_no
         @@posted_low_memory_warning = true
       end
 
-      @@ask_activate_online_repos_result = Popup.AnyQuestion(Popup.NoHeadline,
-        msg, Label.YesButton, Label.NoButton, default_button)
+      msg << _("Activate online repositories now?")
+
+      @@ask_activate_online_repos_result = Popup.AnyQuestion(
+        Popup.NoHeadline,
+        msg.join("\n\n"),
+        Label.YesButton,
+        Label.NoButton,
+        @@posted_low_memory_warning ? :focus_no : :focus_yes
+      )
     end
 
     # fallback when alias is not defined


Reply via email to