Profile Location: Use Report instead of Popup to not block AutoYast (#…

…243) * Profile Location: Use Report instead of Popup to not block AutoYast * Bumped version and updated changelog.
yast · Aug 26, 2016 · 4d2a104 · 4d2a104
1 parent 883d3a4
commit 4d2a104
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Aug 26 09:39:55 UTC 2016 - kanderssen@suse.com
+
+- Profile Location: Use Report instead of Popup to not block
+  AutoYast if not configured to. (bnc#988949)
+- 3.1.149
+
 -------------------------------------------------------------------
 Thu Aug 25 14:10:57 CEST 2016 - schubi@suse.de
 

diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           autoyast2
-Version:        3.1.148
+Version:        3.1.149
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/include/autoinstall/autoinst_dialogs.rb b/src/include/autoinstall/autoinst_dialogs.rb
@@ -12,6 +12,7 @@ def initialize_autoinstall_autoinst_dialogs(include_target)
       textdomain "autoinst"
       Yast.import "Label"
       Yast.import "Storage"
+      Yast.import "Popup"
     end
 
     # Shows a dialog when 'control file' can't be found

diff --git a/src/modules/ProfileLocation.rb b/src/modules/ProfileLocation.rb
@@ -20,7 +20,7 @@ def main
       Yast.import "StorageControllers"
       Yast.import "Mode"
       Yast.import "Installation"
-      Yast.import "Popup"
+      Yast.import "Report"
       Yast.import "Label"
       Yast.import "URL"
 
@@ -153,7 +153,7 @@ def Process
           raise Break if AutoinstConfig.scheme == "device"
         end
         if AutoinstConfig.scheme == "label"
-          Popup.Error(_("label not found while looking for autoyast profile"))
+          Report.Error(_("label not found while looking for autoyast profile"))
         end
       end
       filename = basename(AutoinstConfig.filepath)
@@ -177,7 +177,7 @@ def Process
         if !ret
           # autoyast hit an error while fetching it's config file
           error = _("An error occurred while fetching the profile:\n")
-          Popup.Error(Ops.add(error, @GET_error))
+          Report.Error(Ops.add(error, @GET_error))
           return false
         end
         tmp = Convert.to_string(SCR.Read(path(".target.string"), localfile))