Merge remote-tracking branch 'upstream/master'

yast · Dec 23, 2015 · c411df1 · c411df1
2 parents 8e5a05c + 107bf22
commit c411df1
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,11 +25,8 @@ stamp-h*
 Makefile.am.common
 *.ami
 *.bz2
-*.spec
-.dep
 tmp.*
 *.log
-*.ybc
 /test-driver
 /testsuite/site.bak
 /test/*.trs

diff --git a/package/yast2-packager.changes b/package/yast2-packager.changes
@@ -1,8 +1,22 @@
 -------------------------------------------------------------------
-Tue Dec  8 10:02:21 UTC 2015 - jsrain@suse.cz
+Tue Dec 22 10:02:21 UTC 2015 - jsrain@suse.cz
 
 - read release notes from media of manually added extension
   (bsc#957241)
+- 3.1.86
+
+-------------------------------------------------------------------
+Mon Dec 21 13:13:47 UTC 2015 - lslezak@suse.cz
+
+- Removed leftover closing rich text tag (bsc#950866)
+- 3.1.85
+
+-------------------------------------------------------------------
+Wed Dec 16 13:03:07 UTC 2015 - lslezak@suse.cz
+
+- Do not remove the system repository when adding an addon fails,
+  better handle errors (bsc#956597)
+- 3.1.84
 
 -------------------------------------------------------------------
 Wed Nov 11 15:48:33 UTC 2015 - lslezak@suse.cz

diff --git a/package/yast2-packager.spec b/package/yast2-packager.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-packager
-Version:        3.1.83
+Version:        3.1.86
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/include/packager/repositories_include.rb b/src/include/packager/repositories_include.rb
@@ -462,12 +462,17 @@ def StoreSource
 
       ret = createSource(url, plaindir, @download_meta, name)
 
-      if ret == :again
-        return :back
-      elsif ret == :abort
-        return :abort
+      case ret
+      when :again 
+        :back
+      when :abort, :cancel
+        :abort
+      when :next
+        :next
+      else
+        log.warn "Received unknown result: #{ret}, using :next instead"
+        :next
       end
-      :next
     end
 
     def TypeDialogOpts(download, url)

diff --git a/src/modules/Packages.rb b/src/modules/Packages.rb
@@ -731,7 +731,7 @@ def product_update_summary(products)
         # (just warn if removed by user or by YaST)
         msg = (transact_by == :user || transact_by == :app_high) ?
           _("<b>Warning:</b> Product <b>%s</b> will be removed.") % h(product_label(product)) :
-          _("<b>Error:</b> Product <b>%s</b> will be automatically removed.</font>") \
+          _("<b>Error:</b> Product <b>%s</b> will be automatically removed.") \
             % h(product_label(product))
 
         HTML.Colorize(msg, "red")