Hello community,

here is the log from the commit of package yast2-packager for openSUSE:Factory 
checked in at 2013-11-10 20:37:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-packager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-packager"

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes    
2013-10-20 10:55:51.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-packager.new/yast2-packager.changes       
2013-11-10 20:37:44.000000000 +0100
@@ -1,0 +2,16 @@
+Wed Nov  6 13:41:42 UTC 2013 - lsle...@suse.cz
+
+- reinitialize the target to sync the libzypp repomanager
+  so the online repositories are correctly written during update
+  (bnc#847659)
+
+-------------------------------------------------------------------
+Mon Nov  4 11:37:42 UTC 2013 - lsle...@suse.cz
+
+- fixed vendor detection, check the output directly in shell
+  to avoid reading binary (non-UTF8) text (bnc#847153)
+- removed non-working *-webpin subpackage (the external service for
+  package search does not work, without that service it is useless)
+  (bnc#845622)
+
+-------------------------------------------------------------------

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

Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.QQWOKY/_old  2013-11-10 20:37:45.000000000 +0100
+++ /var/tmp/diff_new_pack.QQWOKY/_new  2013-11-10 20:37:45.000000000 +0100
@@ -84,18 +84,14 @@
 Provides:       yast2-trans-package-manager
 Obsoletes:      yast2-trans-inst-packages
 Obsoletes:      yast2-trans-package-manager
+# force *-webpin subpackage removal at upgrade
+Obsoletes:      yast2-packager-webpin < %version
 
 Requires:       yast2-ruby-bindings >= 1.0.0
-
 Summary:        YaST2 - Package Library
 License:        GPL-2.0+
 Group:          System/YaST
 
-%package webpin
-Requires:       yast2-ruby-bindings >= 1.0.0
-Summary:        YaST2 - Webpin package search client
-Group:          System/YaST
-
 %package devel-doc
 Requires:       yast2-packager = %version
 Summary:        YaST2 - Development Documentation
@@ -104,10 +100,6 @@
 %description
 This package contains the libraries and modules for software management.
 
-%description webpin
-This package contains a client for searching packages in online repositories
-(webpin) and installing them via OneClickInstall
-
 %description devel-doc
 This package contains development documentation for using the API
 provided by yast2-packager package.
@@ -128,9 +120,7 @@
 %{yast_yncludedir}/checkmedia/*
 %{yast_yncludedir}/packager/*
 %{yast_clientdir}/*.rb
-%exclude %{yast_clientdir}/webpin_package_search.rb
 %{yast_moduledir}/*
-%exclude %{yast_moduledir}/WebpinPackageSearch.rb
 %{yast_desktopdir}/*.desktop
 %{yast_scrconfdir}/*
 %{yast_execcompdir}/servers_non_y2/ag_*
@@ -140,9 +130,4 @@
 %files devel-doc
 %doc %{yast_docdir}/autodocs
 
-%files webpin
-%defattr(-,root,root)
-%{yast_clientdir}/webpin_package_search.rb
-%{yast_moduledir}/WebpinPackageSearch.rb
-
 %changelog

++++++ yast2-packager-3.1.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-packager-3.1.0/CONTRIBUTING.md 
new/yast2-packager-3.1.0/CONTRIBUTING.md
--- old/yast2-packager-3.1.0/CONTRIBUTING.md    1970-01-01 01:00:00.000000000 
+0100
+++ new/yast2-packager-3.1.0/CONTRIBUTING.md    2013-11-08 12:49:48.000000000 
+0100
@@ -0,0 +1,87 @@
+YaST Contribution Guidelines
+============================
+
+YaST is an open source project and as such it welcomes all kinds of
+contributions. If you decide to contribute, please follow these guidelines to
+ensure the process is effective and pleasant both for you and YaST maintainers.
+
+There are two main forms of contribution: reporting bugs and performing code
+changes.
+
+Bug Reports
+-----------
+
+If you find a problem, please report it either using
+[Bugzilla](https://bugzilla.novell.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2)
+or [GitHub issues](../../issues). (For Bugzilla, use the [simplified
+registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp)
+if you don't have an account yet.)
+
+If you find a problem, please report it either using
+[Bugzilla](https://bugzilla.novell.com/) or GitHub issues. We can't guarantee
+that every bug will be fixed, but we'll try.
+
+When creating a bug report, please follow our [bug reporting
+guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug).
+
+Code Changes
+------------
+
+We welcome all kinds of code contributions, from simple bug fixes to 
significant
+refactorings and implementation of new features. However, before making any
+non-trivial contribution, get in touch with us first — this can prevent wasted
+effort on both sides. Also, have a look at our [development
+documentation](http://en.opensuse.org/openSUSE:YaST_development).
+
+To send us your code change, use GitHub pull requests. The workflow is as
+follows:
+
+  1. Fork the project.
+
+  2. Create a topic branch based on `master`.
+
+  3. Implement your change, including tests (if possible). Make sure you adhere
+     to the [Ruby style
+     guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md).
+
+  4. Make sure your change didn't break anything by building the RPM package
+     (`rake osc:build`). The build process includes running the full testsuite.
+
+  5. Publish the branch and create a pull request.
+
+  6. YaST developers will review your change and possibly point out issues.
+     Adapt the code under their guidance until they are all resolved.
+
+  7. Finally, the pull request will get merged or rejected.
+
+See also [GitHub's guide on
+contributing](https://help.github.com/articles/fork-a-repo).
+
+If you want to do multiple unrelated changes, use separate branches and pull
+requests.
+
+Do not change the `VERSION` and `*.changes` files as this could lead to
+conflicts.
+
+### Commits
+
+Each commit in the pull request should do only one thing, which is clearly
+described by its commit message. Especially avoid mixing formatting changes and
+functional changes into one commit. When writing commit messages, adhere to
+[widely used
+conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+
+If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure
+you mention it in the commit message for cross-reference. Use format like
+bnc#775814 or gh#yast/yast-foo#42. See also [GitHub
+autolinking](https://help.github.com/articles/github-flavored-markdown#references)
+and [openSUSE abbreviation
+reference](http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations).
+
+Additional Information
+----------------------
+
+If you have any question, feel free to ask at the [development mailing
+list](http://lists.opensuse.org/yast-devel/) or at the
+[#yast](http://webchat.freenode.net/?channels=%23yast) IRC channel on freenode.
+We'll do our best to provide a timely and accurate answer.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-packager-3.1.0/package/yast2-packager.changes 
new/yast2-packager-3.1.0/package/yast2-packager.changes
--- old/yast2-packager-3.1.0/package/yast2-packager.changes     2013-10-15 
15:54:19.000000000 +0200
+++ new/yast2-packager-3.1.0/package/yast2-packager.changes     2013-11-08 
12:49:48.000000000 +0100
@@ -1,4 +1,20 @@
 -------------------------------------------------------------------
+Wed Nov  6 13:41:42 UTC 2013 - lsle...@suse.cz
+
+- reinitialize the target to sync the libzypp repomanager
+  so the online repositories are correctly written during update
+  (bnc#847659)
+
+-------------------------------------------------------------------
+Mon Nov  4 11:37:42 UTC 2013 - lsle...@suse.cz
+
+- fixed vendor detection, check the output directly in shell
+  to avoid reading binary (non-UTF8) text (bnc#847153)
+- removed non-working *-webpin subpackage (the external service for
+  package search does not work, without that service it is useless)
+  (bnc#845622)
+
+-------------------------------------------------------------------
 Tue Oct 15 08:24:06 UTC 2013 - lsle...@suse.cz
 
 - updated help text in "Adding a GPG Public Key" dialog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-packager-3.1.0/package/yast2-packager.spec 
new/yast2-packager-3.1.0/package/yast2-packager.spec
--- old/yast2-packager-3.1.0/package/yast2-packager.spec        2013-10-15 
15:54:19.000000000 +0200
+++ new/yast2-packager-3.1.0/package/yast2-packager.spec        2013-11-08 
12:49:48.000000000 +0100
@@ -75,15 +75,12 @@
 Obsoletes:     y2t_spkg y2t_inst-packages y2pkginf y2c_spkg
 Provides:      yast2-trans-package-manager yast2-trans-inst-packages
 Obsoletes:     yast2-trans-package-manager yast2-trans-inst-packages
+# force *-webpin subpackage removal at upgrade
+Obsoletes:      yast2-packager-webpin < %version
 
 Requires:       yast2-ruby-bindings >= 1.0.0
-
 Summary:       YaST2 - Package Library
 
-%package webpin
-Group:         System/YaST
-Requires:       yast2-ruby-bindings >= 1.0.0
-Summary:       YaST2 - Webpin package search client
 
 %package devel-doc
 Requires:       yast2-packager = %version
@@ -93,10 +90,6 @@
 %description
 This package contains the libraries and modules for software management.
 
-%description webpin
-This package contains a client for searching packages in online repositories
-(webpin) and installing them via OneClickInstall
-
 %description devel-doc
 This package contains development documentation for using the API
 provided by yast2-packager package.
@@ -118,9 +111,7 @@
 %{yast_yncludedir}/checkmedia/*
 %{yast_yncludedir}/packager/*
 %{yast_clientdir}/*.rb
-%exclude %{yast_clientdir}/webpin_package_search.rb
 %{yast_moduledir}/*
-%exclude %{yast_moduledir}/WebpinPackageSearch.rb
 %{yast_desktopdir}/*.desktop
 %{yast_scrconfdir}/*
 %{yast_execcompdir}/servers_non_y2/ag_*
@@ -130,8 +121,4 @@
 %files devel-doc
 %doc %{yast_docdir}/autodocs
 
-%files webpin
-%defattr(-,root,root)
-%{yast_clientdir}/webpin_package_search.rb
-%{yast_moduledir}/WebpinPackageSearch.rb
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-packager-3.1.0/src/Makefile.am 
new/yast2-packager-3.1.0/src/Makefile.am
--- old/yast2-packager-3.1.0/src/Makefile.am    2013-10-15 15:54:19.000000000 
+0200
+++ new/yast2-packager-3.1.0/src/Makefile.am    2013-11-08 12:49:48.000000000 
+0100
@@ -14,7 +14,6 @@
   modules/Packages.rb \
   modules/SourceDialogs.rb \
   modules/SourceManagerSLP.rb \
-  modules/WebpinPackageSearch.rb \
   modules/KeyManager.rb \
   modules/CheckMedia.rb \
   modules/SlideShowCallbacks.rb
@@ -43,7 +42,6 @@
   clients/inst_desktop.rb \
   clients/inst_mediacopy.rb \
   clients/wrapper_slideshow_callbacks.rb \
-  clients/webpin_package_search.rb \
   clients/checkmedia.rb
 
 yncludedir = @yncludedir@/packager
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-packager-3.1.0/src/clients/pkg_finish.rb 
new/yast2-packager-3.1.0/src/clients/pkg_finish.rb
--- old/yast2-packager-3.1.0/src/clients/pkg_finish.rb  2013-10-15 
15:54:19.000000000 +0200
+++ new/yast2-packager-3.1.0/src/clients/pkg_finish.rb  2013-11-08 
12:49:48.000000000 +0100
@@ -185,6 +185,10 @@
 
       Builtins.y2milestone("All old repositories were removed from the target")
 
+      # reload the target to sync the removed repositories with libzypp 
repomanager
+      Pkg.TargetFinish
+      Pkg.TargetInitialize("/mnt")
+
       nil
     end
   end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-packager-3.1.0/src/clients/repositories.rb 
new/yast2-packager-3.1.0/src/clients/repositories.rb
--- old/yast2-packager-3.1.0/src/clients/repositories.rb        2013-10-15 
15:54:19.000000000 +0200
+++ new/yast2-packager-3.1.0/src/clients/repositories.rb        2013-11-08 
12:49:48.000000000 +0100
@@ -282,7 +282,9 @@
         RemoveDeletedAddNewRepos()
       end
 
-      itemList = repo_mode ? @sourceStatesOut : @serviceStatesOut
+      itemList = repo_mode ?
+        deep_copy(@sourceStatesOut) :
+        deep_copy(@serviceStatesOut)
 
       # displaye only repositories from the selected service
       if repo_mode && service_name != ""
@@ -346,7 +348,7 @@
 
     def fillRepoInfo(index, source, repo_mode, service_name)
       source = deep_copy(source)
-      info = repo_mode ? getSourceInfo(index, source) : source
+      info = repo_mode ? getSourceInfo(index, source) : deep_copy(source)
       if repo_mode
         Builtins.y2milestone("getSourceInfo(%1, %2): %3", index, source, info)
       end
@@ -1114,7 +1116,7 @@
 
           if Ops.less_than(id, 0) && @repository_view &&
               @displayed_service == ""
-            Builtins.y2internal(
+            Builtins.y2error(
               "Unable to determine repository id, broken repository?"
             )
             next
@@ -1395,11 +1397,11 @@
 
             data = @repository_view ?
               @displayed_service == "" ?
-                @sourceStatesOut :
+                deep_copy(@sourceStatesOut) :
                 ReposFromService(@displayed_service, @sourceStatesOut) :
-              @serviceStatesOut
+              deep_copy(@serviceStatesOut)
 
-            Builtins.y2internal("data: %1", data)
+            Builtins.y2milestone("data: %1", data)
 
             Builtins.foreach(data) do |src_state|
               if Ops.get_boolean(src_state, "enabled", false) &&
@@ -1658,7 +1660,7 @@
               new_keep = Convert.to_boolean(
                 UI.QueryWidget(Id(:keeppackages), :Value)
               )
-              Builtins.y2internal("New keep packages option: %1", new_keep)
+              Builtins.y2milestone("New keep packages option: %1", new_keep)
 
               Ops.set(sourceState, "keeppackages", new_keep)
               Ops.set(@sourceStatesOut, global_current, sourceState)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-packager-3.1.0/src/clients/sw_single.rb 
new/yast2-packager-3.1.0/src/clients/sw_single.rb
--- old/yast2-packager-3.1.0/src/clients/sw_single.rb   2013-10-15 
15:54:19.000000000 +0200
+++ new/yast2-packager-3.1.0/src/clients/sw_single.rb   2013-11-08 
12:49:48.000000000 +0100
@@ -504,7 +504,7 @@
 
       # an extra step is needed in dir inst mode
       if Installation.destdir != "/"
-        Builtins.y2internal("Extra step is needed")
+        Builtins.y2milestone("Extra step is needed")
         # %1 is path to the target system (e.g. /tmp/dirinstall
         Builtins.sformat(
           _("Reset the target system to %1"),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-packager-3.1.0/src/clients/webpin_package_search.rb 
new/yast2-packager-3.1.0/src/clients/webpin_package_search.rb
--- old/yast2-packager-3.1.0/src/clients/webpin_package_search.rb       
2013-10-15 15:54:19.000000000 +0200
+++ new/yast2-packager-3.1.0/src/clients/webpin_package_search.rb       
1970-01-01 01:00:00.000000000 +0100
@@ -1,498 +0,0 @@
-# encoding: utf-8
-
-# File:        webpin_package_search.ycp
-# Package:     YaST packager - Client using Webpin XML API
-# Authors:     Katarina Machalkova <kmachalk...@suse.cz>
-#              Lukas Ocilka <loci...@suse.cz>
-#
-# $Id$
-#
-# This client provides UI for searching for packages
-# via Webpin XML.
-# See http://en.opensuse.org/Package_Search/Design for the API.
-module Yast
-  class WebpinPackageSearchClient < Client
-    def main
-      Yast.import "UI"
-      textdomain "packager"
-
-      Yast.import "Label"
-      Yast.import "Popup"
-      Yast.import "Progress"
-      Yast.import "Sequencer"
-      Yast.import "WebpinPackageSearch"
-      Yast.import "Wizard"
-      Yast.import "Directory"
-      Yast.import "Map"
-      Yast.import "Report"
-
-      @search_results = {}
-      @all_selected = {}
-
-
-      Wizard.CreateDialog
-
-      @client_ret = MainSequence()
-
-      Wizard.CloseDialog
-
-      @client_ret
-    end
-
-    def SomethingSelected
-      @all_selected != {}
-    end
-
-    def AbortDialog
-      if SomethingSelected()
-        return Popup.YesNo(_("All changes will be lost. Really exit?"))
-      else
-        return true
-      end
-    end
-
-    def Abort
-      ret = UI.PollInput
-
-      if ret == :abort
-        return AbortDialog()
-      else
-        return false
-      end
-    end
-
-    def SearchExpression
-      ret = Convert.to_string(UI.QueryWidget(Id("search_text"), :Value))
-
-      if ret == ""
-        Popup.Message(_("Search expression must not be empty!"))
-        UI.SetFocus(Id("search_text"))
-      end
-      ret
-    end
-
-    def SearchParameters
-      p = Convert.to_list(UI.QueryWidget(Id("search_in"), :SelectedItems))
-
-      ret = Builtins.listmap(["name", "description", "contents"]) do |key|
-        { key => Builtins.contains(p, key) }
-      end
-      #y2internal("%1", ret);
-      deep_copy(ret)
-    end
-
-    def CurrentTable
-      ctable = UI.WidgetExists(Id("results")) ? "results" : "all"
-
-      ctable
-    end
-
-    def CreatePackageDescription
-      ctable = CurrentTable()
-      checksum = Convert.to_string(UI.QueryWidget(Id(ctable), :CurrentItem))
-
-      citem = ctable == "results" ?
-        Ops.get(@search_results, checksum, {}) :
-        Ops.get(@all_selected, checksum, {})
-      ret = ""
-
-      if citem != {}
-        descr = Builtins.sformat(
-          _("<b>Repository URL:</b> %1<br>"),
-          Ops.get_string(citem, "repoURL", "")
-        )
-        version = Builtins.sformat(
-          _("<b>Version:</b> %1<br>"),
-          Ops.get_string(citem, "version", "")
-        )
-
-        archs = Builtins.sformat(
-          _("<b>Architecture:</b> %1<br>"),
-          Builtins.mergestring(Ops.get_list(citem, "archs", []), ",")
-        )
-        ret = Ops.add(
-          Ops.add(Ops.add(Ops.add("<p>", descr), version), archs),
-          "</p>"
-        )
-      end
-
-      UI.ChangeWidget(Id("description"), :Value, ret)
-
-      nil
-    end
-
-    def CreatePackageListItems(results)
-      results = deep_copy(results)
-      pkg_items = []
-
-      Builtins.foreach(results) do |iD, pkg_line|
-        # Webpin seems to return "ppc" arch even for some i386 packages (e.g., 
"joe")
-        # doesn't match the architecture
-        #      if (! WebpinPackageSearch::MatchesCurrentArchitecture 
(it["archs"]:["noarch"])) {
-        #          y2milestone ("Doesn't match the current arch: %1", it);
-        #          return;
-        #      }
-        pkg_items = Builtins.add(
-          pkg_items,
-          Item(
-            Id(iD),
-            Ops.add(
-              Ops.add(Ops.get_string(pkg_line, "name", ""), " - "),
-              Ops.get_string(pkg_line, "summary", "")
-            )
-          )
-        )
-      end
-      deep_copy(pkg_items)
-    end
-
-    def PopulatePackageList(results)
-      results = deep_copy(results)
-      items = CreatePackageListItems(results)
-      ctable = CurrentTable()
-
-      _IDs = Convert.convert(
-        Builtins.toset(Map.Keys(results)),
-        :from => "list",
-        :to   => "list <string>"
-      )
-      wantedIDs = Convert.convert(
-        Builtins.toset(Map.Keys(@all_selected)),
-        :from => "list",
-        :to   => "list <string>"
-      )
-      Builtins.y2milestone(
-        "Package IDs: %1, previously selected: %2",
-        _IDs,
-        wantedIDs
-      )
-
-      if results != nil
-        UI.ChangeWidget(Id(ctable), :Items, items)
-
-        if ctable == "all"
-          UI.ChangeWidget(Id(ctable), :SelectedItems, wantedIDs)
-        else
-          UI.ChangeWidget(
-            Id(ctable),
-            :SelectedItems,
-            Builtins::Multiset.intersection(_IDs, wantedIDs)
-          )
-        end
-
-        UI.SetFocus(Id(ctable))
-      else
-        UI.SetFocus(Id("search_text"))
-      end
-
-      nil
-    end
-
-    def SelectedPackages
-      result = []
-
-      Builtins.foreach(@all_selected) { |s, m| result = Builtins.add(result, 
m) }
-
-      Builtins.y2milestone("Passing these data to WebPin %1", result)
-      deep_copy(result)
-    end
-
-    def AddItemIfNotExists(checksum, data)
-      data = deep_copy(data)
-      if !Builtins.haskey(@all_selected, checksum)
-        Ops.set(@all_selected, checksum, data)
-      end
-
-      nil
-    end
-
-    def RemoveItemIfExists(checksum)
-      if Builtins.haskey(@all_selected, checksum)
-        @all_selected = Builtins.remove(@all_selected, checksum)
-      end
-
-      nil
-    end
-
-    def UpdateSelectedPkgs
-      ctable = CurrentTable()
-      selected_items = Builtins.toset(
-        Convert.convert(
-          UI.QueryWidget(Id(ctable), :SelectedItems),
-          :from => "any",
-          :to   => "list <string>"
-        )
-      )
-      other_items = []
-
-      tt = Convert.convert(
-        UI.QueryWidget(Id(ctable), :Items),
-        :from => "any",
-        :to   => "list <term>"
-      )
-      Builtins.foreach(tt) do |t|
-        tmp = Ops.get_string(
-          Builtins.argsof(Ops.get_term(Builtins.argsof(t), 0, term(:none))),
-          0,
-          ""
-        )
-        if !Builtins.contains(selected_items, tmp)
-          other_items = Builtins.add(other_items, tmp)
-        end
-      end
-
-      other_items = Builtins.toset(other_items)
-
-      Builtins.foreach(selected_items) do |it|
-        AddItemIfNotExists(it, Ops.get(@search_results, it, {}))
-      end if ctable == "results"
-      Builtins.foreach(other_items) { |it| RemoveItemIfExists(it) }
-
-
-      Builtins.y2milestone("Selecting these packages: %1", @all_selected)
-
-      nil
-    end
-
-    def ReadDialog
-      steps = [
-        _("Check Network Configuration"),
-        _("Initialize Software Manager")
-      ]
-
-      actions = [
-        _("Checking Network Configuration ..."),
-        _("Initializing Software Manager ... ")
-      ]
-
-      Progress.New(
-        _("Reading Package Search Setup..."),
-        " ",
-        Builtins.size(steps),
-        steps,
-        actions,
-        _("<p>Packager is initializing...</p>")
-      )
-
-      Progress.NextStage
-      return :abort if Abort()
-      Builtins.sleep(100)
-
-      Progress.NextStage
-      return :abort if Abort()
-      Builtins.sleep(100)
-
-      Progress.Finish
-      :next
-    end
-
-    def MainDialog
-      current_search_box = MultiSelectionBox(
-        Id("results"),
-        Opt(:notify, :hstretch),
-        "",
-        []
-      )
-      all_pkgs_box = MultiSelectionBox(
-        Id("all"),
-        Opt(:notify, :hstretch),
-        "",
-        []
-      )
-
-      Wizard.SetContents(
-        # TRANSLATORS: dialog caption
-        _("Package Search"),
-        VBox(
-          HBox(
-            VBox(
-              HBox(
-                Bottom(
-                  InputField(
-                    Id("search_text"),
-                    Opt(:hstretch),
-                    _("Search &Expression")
-                  )
-                ),
-                # TRANSLATORS: push button
-                HSpacing(1),
-                Bottom(PushButton(Id("search"), Opt(:default), _("&Search")))
-              ),
-              VStretch()
-            ), #,
-            MultiSelectionBox(
-              Id("search_in"),
-              _("Search &in"),
-              [
-                Item(Id("name"), _("Name"), true),
-                Item(Id("description"), _("Description"), true),
-                Item(Id("contents"), _("Contents"))
-              ]
-            )
-          ),
-          #`RadioButtonGroup(
-          #    `id(`rb),
-          #    `VBox(
-          #        `Left(`Label( _("Search Repositories"))),
-          #        `Frame( "",
-          #        `VBox(
-          #                
`Left(`RadioButton(`id("current_product"),_("Current product") ) ),
-          #                `Left(`RadioButton(`id("factory"),_("Factory") ) ),
-          #                `VStretch()
-          #        )
-          #         )
-          #    )
-          #)
-          #)
-          #),
-          VWeight(
-            2,
-            DumbTab(
-              Id("tab_bar"),
-              [
-                Item(Id("search_tab"), _("&Found Packages"), true),
-                Item(Id("all_tab"), _("&All Selected Packages"))
-              ],
-              ReplacePoint(Id(:rp), current_search_box)
-            )
-          ),
-          #`HBox(
-          Left(Label(_("Package Description"))),
-          #`HStretch(),
-          #`CheckBox(_("Keep Package Repositories Subscribed"), true)
-          #),
-          VWeight(1, RichText(Id("description"), ""))
-        ),
-        _(
-          "<p><big><b>Package Search</b></big><br>\nUse the functionality of 
<i>Webpin package search</i> to search in all known openSUSE build-service and 
openSUSE community repositories.</p>\n"
-        ) +
-          _(
-            "<p><big><b>Security</b></big><br> The software found is often not 
part of the\n" +
-              "distribution itself. You need to decide whether to trust the 
source of a\n" +
-              "package. We do not take any responsibility for installing such 
software.</p>\n"
-          ),
-        #We don't need back button
-        false,
-        true
-      )
-
-      Wizard.SetDesktopTitleAndIcon("webpin")
-      Wizard.SetAbortButton(:cancel, Label.CancelButton)
-
-      UI.SetFocus(Id("search_text"))
-
-
-      dialog_ret = nil
-      while true
-        dialog_ret = UI.UserInput
-
-        UpdateSelectedPkgs() if dialog_ret != "results" && dialog_ret != "all"
-
-        if dialog_ret == :next
-          temporary_xml = Ops.add(
-            Directory.tmpdir,
-            "/one_click_install_temporary_file.xml"
-          )
-
-          selected_packages = SelectedPackages()
-
-          if selected_packages == nil || Builtins.size(selected_packages) == 0
-            Report.Message(_("Select packages to install."))
-            UI.SetFocus(Id("results"))
-            next
-          end
-
-          WebpinPackageSearch.PrepareOneClickInstallDescription(
-            selected_packages,
-            temporary_xml
-          )
-
-          oci = WFM.CallFunction("OneClickInstallUI", [temporary_xml])
-          Builtins.y2milestone("OneClickInstallUI returned: %1", oci)
-          break
-        elsif dialog_ret == "search"
-          UI.ChangeWidget(Id("tab_bar"), :CurrentItem, "search_tab")
-          UI.ReplaceWidget(Id(:rp), current_search_box)
-          search_expr = SearchExpression()
-
-          if search_expr != ""
-            search_params = SearchParameters()
-            Popup.ShowFeedback("", _("Searching for packages..."))
-            tmp_results = WebpinPackageSearch.SearchForPackages(
-              search_expr,
-              nil,
-              search_params
-            )
-            @search_results = Builtins.listmap(tmp_results) do |m|
-              { Ops.get_string(m, "checksum", "") => m }
-            end
-            Popup.ClearFeedback
-            PopulatePackageList(@search_results)
-
-            if @search_results == nil
-              # error message
-              UI.ChangeWidget(
-                Id("description"),
-                :Value,
-                _("<p><b>Search failed</b></p>")
-              )
-            elsif @search_results == {}
-              UI.ChangeWidget(
-                Id("description"),
-                :Value,
-                _(
-                  "<p><b>No packages matching entered criteria were 
found.</b></p>"
-                )
-              )
-            else
-              CreatePackageDescription()
-            end
-          end
-          next
-        elsif dialog_ret == "search_tab"
-          UI.ReplaceWidget(Id(:rp), current_search_box)
-          PopulatePackageList(@search_results)
-          CreatePackageDescription()
-        elsif dialog_ret == "all_tab"
-          UI.ReplaceWidget(Id(:rp), all_pkgs_box)
-          PopulatePackageList(@all_selected)
-          CreatePackageDescription()
-        elsif dialog_ret == "results" || dialog_ret == "all"
-          CreatePackageDescription()
-        elsif dialog_ret == :abort || dialog_ret == :cancel
-          if AbortDialog()
-            dialog_ret = :abort
-            Builtins.y2milestone("Aborting...")
-            break
-          end
-        else
-          Builtins.y2error("Unknown ret: %1", dialog_ret)
-        end
-      end
-      Convert.to_symbol(dialog_ret)
-    end
-
-    def MainSequence
-      aliases =
-        #          "write"   : ``(WriteDialog())
-        { "read" => lambda { ReadDialog() }, "main" => lambda { MainDialog() } 
}
-
-      sequence =
-        #          "write" : $[
-        #              `abort : `abort,
-        #              `next  : `next
-        #          ],
-        {
-          "ws_start" => "read",
-          "read"     => { :next => "main", :abort => :abort },
-          "main"     => { :abort => :abort, :next => :next }
-        }
-
-      seq_ret = Sequencer.Run(aliases, sequence)
-
-      Convert.to_symbol(seq_ret)
-    end
-  end
-end
-
-Yast::WebpinPackageSearchClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-packager-3.1.0/src/modules/PackageSlideShow.rb 
new/yast2-packager-3.1.0/src/modules/PackageSlideShow.rb
--- old/yast2-packager-3.1.0/src/modules/PackageSlideShow.rb    2013-10-15 
15:54:19.000000000 +0200
+++ new/yast2-packager-3.1.0/src/modules/PackageSlideShow.rb    2013-11-08 
12:49:48.000000000 +0100
@@ -1343,7 +1343,7 @@
 
       # remove path
       pkg_filename = StripPath(pkg_location)
-      Builtins.y2internal("pkg_name: %1", pkg_name)
+      Builtins.y2milestone("pkg_name: %1", pkg_name)
 
       if deleting
         pkg_size = -1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-packager-3.1.0/src/modules/Packages.rb 
new/yast2-packager-3.1.0/src/modules/Packages.rb
--- old/yast2-packager-3.1.0/src/modules/Packages.rb    2013-10-15 
15:54:19.000000000 +0200
+++ new/yast2-packager-3.1.0/src/modules/Packages.rb    2013-11-08 
12:49:48.000000000 +0100
@@ -838,24 +838,10 @@
 
     # CHeck whether this is a Dell system
     def DellSystem
-      ret = false
-      command = "/usr/sbin/hwinfo --bios"
+      command = "/usr/sbin/hwinfo --bios | grep -q '^[[:space:]]*Vendor:.*Dell 
Inc\\.'"
       Builtins.y2milestone("Executing: %1", command)
 
-      out = Convert.to_map(SCR.Execute(path(".target.bash_output"), command))
-      Builtins.y2milestone("Result: %1", out)
-
-      if Ops.get_integer(out, "exit", -1) == 0
-        lines = Builtins.splitstring(Ops.get_string(out, "stdout", ""), "\n")
-
-        Builtins.foreach(lines) do |line|
-          if Builtins.regexpmatch(line, "Vendor:.*Dell Inc.*")
-            Builtins.y2milestone("Found matching line: %1", line)
-            ret = true
-          end
-        end
-      end
-
+      ret = SCR.Execute(path(".target.bash"), command) == 0
       Builtins.y2milestone("Detected a Dell system") if ret
 
       ret
@@ -1560,7 +1546,7 @@
           AddOnProduct.UpdateInstSys(Ops.add(spdir, "/y2update.tgz"))
         end
         @theSources = Builtins.add(@theSources, sp_source)
-        Builtins.y2internal(
+        Builtins.y2milestone(
           "Service pack repository: %1, changing to URL: %2",
           sp_source,
           base_url
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-packager-3.1.0/src/modules/SourceDialogs.rb 
new/yast2-packager-3.1.0/src/modules/SourceDialogs.rb
--- old/yast2-packager-3.1.0/src/modules/SourceDialogs.rb       2013-10-15 
15:54:19.000000000 +0200
+++ new/yast2-packager-3.1.0/src/modules/SourceDialogs.rb       2013-11-08 
12:49:48.000000000 +0100
@@ -2184,7 +2184,7 @@
           @_url = "commrepos://"
         end
       else
-        Builtins.y2internal("Unexpected repo type %1", selected)
+        Builtins.y2error("Unexpected repo type %1", selected)
       end
 
       nil
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-packager-3.1.0/src/modules/SpaceCalculation.rb 
new/yast2-packager-3.1.0/src/modules/SpaceCalculation.rb
--- old/yast2-packager-3.1.0/src/modules/SpaceCalculation.rb    2013-10-15 
15:54:19.000000000 +0200
+++ new/yast2-packager-3.1.0/src/modules/SpaceCalculation.rb    2013-11-08 
12:49:48.000000000 +0100
@@ -699,7 +699,7 @@
                     )
                     Builtins.foreach(partition) do |p|
                       if Ops.get_string(p, "name", "") == tmpdir
-                        Builtins.y2internal("P: %1", p)
+                        Builtins.y2milestone("P: %1", p)
                         free_size = Ops.multiply(
                           Builtins.tointeger(Ops.get_string(p, "free", "0")),
                           1024
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-packager-3.1.0/src/modules/WebpinPackageSearch.rb 
new/yast2-packager-3.1.0/src/modules/WebpinPackageSearch.rb
--- old/yast2-packager-3.1.0/src/modules/WebpinPackageSearch.rb 2013-10-15 
15:54:19.000000000 +0200
+++ new/yast2-packager-3.1.0/src/modules/WebpinPackageSearch.rb 1970-01-01 
01:00:00.000000000 +0100
@@ -1,502 +0,0 @@
-# encoding: utf-8
-
-# File:
-#      WebpinPackageSearch.ycp
-#
-# Module:
-#      WebpinPackageSearch
-#
-# Summary:
-#      YaST API to api.opensuse-community.org
-#
-# Authors:
-#      Lukas Ocilka <loci...@suse.cz>
-#      Katarina Machalkova <kmachalk...@suse.cz>
-require "yast"
-
-module Yast
-  class WebpinPackageSearchClass < Module
-    def main
-
-      textdomain "packager"
-
-      Yast.import "HTTP"
-      Yast.import "OSRelease"
-      Yast.import "Directory"
-      Yast.import "FileUtils"
-      Yast.import "URL"
-      Yast.import "Arch"
-      Yast.import "Report"
-
-      @temporary_file = Ops.add(Directory.tmpdir, "/package_search_webpin.xml")
-
-      # Base search URL, default is 
"http://api.opensuse-community.org/searchservice/";
-      @base_url = "http://api.opensuse-community.org/searchservice/";
-
-      # List of architecture dependencies. Every row contains one list
-      # of dependencies sortred from left (the newest) to right (the oldest).
-      # Architectures are backward-compatible.
-      @deps = [
-        # i386 and x86
-        ["x86_64", "i686", "i586", "i486", "i386", "noarch", "src"],
-        # PPC
-        ["ppc64", "ppc", "noarch", "src"],
-        # s390
-        ["s390_64", "s390_32", "noarch", "src"],
-        # IA-64
-        ["ia64", "noarch", "src"],
-        # Alpha
-        [
-          "alphaev67",
-          "alphaev6",
-          "alphapca56",
-          "alphaev56",
-          "alphaev5",
-          "alpha",
-          "noarch",
-          "src"
-        ],
-        # SPARC
-        ["sparc64", "sparcv9", "sparcv8", "sparc", "noarch", "src"],
-        # MIPS
-        ["mips64", "mips", "noarch", "src"]
-      ]
-
-      @already_guessed = nil
-    end
-
-    # Sets base search URL
-    # WARNING: Use this only if you know what you are doing!
-    #
-    # @param string new base_url
-    def SetBaseSearchURL(new_base_url)
-      if new_base_url == "" || new_base_url == nil
-        Builtins.y2error("Wrong base URL: '%1'", new_base_url)
-        return
-      end
-
-      @base_url = new_base_url
-      Builtins.y2milestone("New base URL has been set: %1", @base_url)
-
-      nil
-    end
-
-    # Returns base search URL
-    #
-    # @string current base_url
-    def GetBaseSearchURL
-      @base_url
-    end
-
-    # Returns whether the current architecture matches the list of 
architectures
-    # got as a parameter. The current architecture is backward compatible, so
-    # also dependencies are taken into account.
-    #
-    # @param list <string> list of architectures to check
-    # @return [Boolean] whether they match the current architecture
-    #
-    # @example
-    #  // current architecture is "i386"
-    #  MatchesCurrentArchitecture (["noarch", "ppc", "i386"]) -> true
-    #  MatchesCurrentArchitecture (["noarch"]) -> true
-    #  MatchesCurrentArchitecture (["x86_64"]) -> false
-    #  MatchesCurrentArchitecture (["ppc"]) -> false
-    def MatchesCurrentArchitecture(archs_to_check)
-      archs_to_check = deep_copy(archs_to_check)
-      current_arch = Arch.architecture
-
-      matches = false
-
-      # one or more archs supported by source
-      Builtins.foreach(archs_to_check) do |one_arch_to_check|
-        # check all arch dependencies
-        Builtins.foreach(@deps) do |one_archlist|
-          # both current and checked architectures are in the same list
-          if Builtins.contains(one_archlist, current_arch) &&
-              Builtins.contains(one_archlist, one_arch_to_check)
-            cur_arch_row = nil
-            match_arch_row = nil
-
-            str_offset = -1
-
-            # find current_architecture in deps
-            Builtins.foreach(one_archlist) do |one_arch|
-              str_offset = Ops.add(str_offset, 1)
-              if one_arch == current_arch
-                cur_arch_row = str_offset
-                raise Break
-              end
-            end
-
-            str_offset = -1
-
-            # find architecture_to_check in deps
-            Builtins.foreach(one_archlist) do |one_arch|
-              str_offset = Ops.add(str_offset, 1)
-              if one_arch == one_arch_to_check
-                match_arch_row = str_offset
-                raise Break
-              end
-            end
-
-            # compare
-            if Ops.greater_or_equal(match_arch_row, cur_arch_row)
-              matches = true
-              raise Break
-            end
-          end
-        end
-        raise Break if matches
-      end
-
-      matches
-    end
-
-    # Guesses the current distribution installed
-    #
-    # @return [String] distribution (Webpin format)
-    #
-    # @examle
-    #   // Installed openSUSE 11.0
-    #   GuessCurrentDistribution() -> "openSUSE_110"
-    def GuessCurrentDistribution
-      return @already_guessed if @already_guessed != nil
-
-      rel_name = OSRelease.ReleaseName
-      rel_version = OSRelease.ReleaseVersion
-
-      if Builtins.regexpmatch(rel_version, ".")
-        rel_version = Builtins.mergestring(
-          Builtins.splitstring(rel_version, "."),
-          ""
-        )
-      end
-
-      @already_guessed = Builtins.sformat("%1_%2", rel_name, rel_version)
-      @already_guessed
-    end
-
-    # Changes the Webpin distro format to OneClickInstall format.
-    #
-    # @param [String] distro
-    # @return [String] modified distro
-    #
-    # @example
-    #   ModifyDistro ("openSUSE_110") -> "openSUSE 11.0"
-    def ModifyDistro(distro)
-      if Builtins.regexpmatch(distro, "^.*_[0123456789]+[0123456789]$")
-        distro = Builtins.regexpsub(
-          distro,
-          "^(.*)_([0123456789]+)([0123456789])$",
-          "\\1 \\2.\\3"
-        )
-      elsif Builtins.regexpmatch(distro, "^.*_[0123456789]+")
-        distro = Builtins.regexpsub(distro, "^(.*)_([0123456789]+)$", "\\1 
\\2")
-      else
-        Builtins.y2warning("'%1' doesn't match any known regexp", distro)
-      end
-
-      distro
-    end
-
-    # Writes XML configuration file for OnleClickInstall client.
-    #
-    # @param [Array<Hash>] packages_to_install (in the same format as got from 
SearchForPackages function)
-    # @param [String] save_to_file
-    # @return [Boolean] if successful
-    #
-    # @see SearchForPackages() for the format of <map> package_to_install
-    def PrepareOneClickInstallDescription(packages_to_install, save_to_file)
-      packages_to_install = deep_copy(packages_to_install)
-      if FileUtils.Exists(save_to_file)
-        Builtins.y2warning("File %1 already exists, removing", save_to_file)
-        SCR.Execute(path(".target.remove"), save_to_file)
-      end
-
-      distro = ""
-      repoURL = ""
-
-      write_xml = {
-        "metapackage" => {
-          "xmlns" => "http://opensuse.org/Standards/One_Click_Install";
-        }
-      }
-
-      repositories = {}
-      packages = {}
-
-      Builtins.foreach(packages_to_install) do |one_package|
-        distro = Ops.get_string(one_package, "distro") do
-          GuessCurrentDistribution()
-        end
-        repoURL = Ops.get_string(one_package, "repoURL", "")
-        # all repositories
-        Ops.set(
-          repositories,
-          distro,
-          Builtins.add(Ops.get_list(repositories, distro, []), repoURL)
-        )
-        # all packages
-        Ops.set(
-          packages,
-          distro,
-          Builtins.add(
-            Ops.get_list(packages, distro, []),
-            {
-              "item" => [
-                {
-                  "name"        => [
-                    { "content" => Ops.get_string(one_package, "name", "") }
-                  ],
-                  "summary"     => [
-                    { "content" => Ops.get_string(one_package, "summary", "") }
-                  ],
-                  "description" => [
-                    {
-                      "content" => Ops.get_locale(
-                        # TRANSLATORS: package description item
-                        one_package,
-                        "description",
-                        Ops.get_locale(
-                          one_package,
-                          "summary",
-                          _("No further information available.")
-                        )
-                      )
-                    }
-                  ]
-                }
-              ]
-            }
-          )
-        )
-      end
-
-      Builtins.foreach(
-        Convert.convert(
-          repositories,
-          :from => "map",
-          :to   => "map <string, list <string>>"
-        )
-      ) do |distro2, distro_repos|
-        group = {
-          "distversion"      => ModifyDistro(distro2),
-          "remainSubscribed" => { "content" => "true" },
-          "repositories"     => Builtins.toset(Builtins.maplist(distro_repos) 
do |one_repo|
-            {
-              "repository" => [
-                {
-                  "name"        => [{ "content" => one_repo }],
-                  "url"         => [{ "content" => one_repo }],
-                  # TRANSLATORS: repository summary
-                  "summary"     => [
-                    { "content" => _("Unknown repository") }
-                  ],
-                  # TRANSLATORS: repositry description
-                  "description" => [
-                    {
-                      "content" => _(
-                        "No further information available, use at your own 
risk."
-                      )
-                    }
-                  ]
-                }
-              ]
-            }
-          end),
-          "software"         => Builtins.toset(
-            Ops.get_list(packages, distro2, [])
-          )
-        }
-        Ops.set(write_xml, ["metapackage", "group"], group)
-      end
-
-      Builtins.y2debug("Writing: %1", write_xml)
-
-      success = SCR.Write(
-        path(".anyxml"),
-        {
-          "xml"  => write_xml,
-          "file" => save_to_file,
-          "args" => {
-            "RootName" => "metapackage",
-            "KeepRoot" => true,
-            "XMLDecl"  => "<?xml version=\"1.0\" encoding=\"UTF-8\" 
standalone=\"yes\"?>"
-          }
-        }
-      )
-
-      if success != true
-        Builtins.y2error("Unable to write XML to %1", save_to_file)
-      end
-
-      success
-    end
-
-    # Searches for packages using Webpin XML API.
-    #
-    # @param [String] search_for text
-    # @param [String] distribution, e.g., openSUSE_10.3, it is guessed from 
the system if set to nil
-    # @param [Hash{String => Boolean}] search_in which defines in which 
sources it searches,
-    #  possible keys: name, description, contents
-    #
-    # @example
-    #   SearchForPackages (
-    #  "desktop",
-    #  nil,
-    #  $[
-    #      "name" : true,
-    #      "description" : true,
-    #      "contents" : false,
-    #          ]
-    #   )
-    #   ->
-    #   [
-    #     ...
-    #     $[
-    #        "archs":[
-    #            "ppc"
-    #        ],
-    #        "checksum":"e0cbdbf03ce47dfd5c5f885b86706ddfa023d8dc",
-    #        "distro":"openSUSE_110",
-    #        "name":"xfce4-desktop",
-    #        "priority":"5",
-    #        
"repoURL":"http://download.opensuse.org/distribution/11.0/repo/oss/suse";,
-    #        "summary":"Desktop manager for the Xfce Desktop Environment",
-    #        "version":"4.4.2"
-    #     ],
-    #     ...
-    #   ]
-    def SearchForPackages(search_for, distribution, search_in)
-      search_in = deep_copy(search_in)
-      Builtins.y2milestone("Searching for %1 in %2", search_for, search_in)
-
-      if search_for == nil || search_for == ""
-        Builtins.y2error("empty search string")
-        return []
-      end
-
-      # search URL is the same for both
-      name_or_descr = Ops.get(search_in, "name", false) ||
-        Ops.get(search_in, "description", false)
-
-      search_path = nil
-
-      if Ops.get(search_in, "contents", false) && name_or_descr
-        search_path = "Search/Simple/"
-      elsif name_or_descr
-        search_path = "Search/ByName/"
-      elsif Ops.get(search_in, "contents", false)
-        search_path = "Search/ByContents/"
-      else
-        Builtins.y2warning("empty search result")
-        return []
-      end
-
-      # if distro string is nil, try to guess the current one
-      if distribution == nil
-        distribution = GuessCurrentDistribution()
-        Builtins.y2milestone(
-          "Distribution not set, guessing '%1'",
-          distribution
-        )
-      end
-
-      url = Ops.add(
-        Ops.add(
-          Ops.add(Ops.add(GetBaseSearchURL(), search_path), distribution),
-          "/"
-        ),
-        URL.EscapeString(search_for, URL.transform_map_passwd)
-      )
-
-      Builtins.y2milestone("HTTP::Get (%1, %2)", url, @temporary_file)
-      response = HTTP.Get(url, @temporary_file)
-      Builtins.y2milestone("Server response: %1", response)
-
-      ret_list = []
-
-      # something's screwed up on server side - this usually means that tmp 
file
-      # is full of error messages - we should not let anyxml agent parse those
-      if Ops.get_integer(response, "code", 0) != 200
-        Builtins.y2error("Cannot retrieve search results from the server")
-        # %1 is HTTP error code like 404 or 503
-        Report.Error(
-          Builtins.sformat(
-            _("Search failed.\nRemote server returned error code %1"),
-            Ops.get_integer(response, "code", 0)
-          )
-        )
-        return nil
-      end
-
-      if !FileUtils.Exists(@temporary_file)
-        Builtins.y2error("Cannot read file: %1", @temporary_file)
-        return nil
-      end
-
-      if Ops.less_or_equal(FileUtils.GetSize(@temporary_file), 0)
-        Builtins.y2milestone("Empty file: %1", @temporary_file)
-        return nil
-      end
-
-      search_result = Convert.to_map(SCR.Read(path(".anyxml"), 
@temporary_file))
-
-      Builtins.y2debug("Search result: %1", search_result)
-
-      counter = -1
-      one_entry = {}
-
-      Builtins.foreach(
-        Ops.get_list(search_result, ["ns2:packages", 0, "package"], [])
-      ) do |one_package|
-        one_entry = {}
-        Builtins.foreach(one_package) do |key, value|
-          if Builtins.haskey(Ops.get_map(value, 0, {}), "content")
-            Ops.set(
-              one_entry,
-              key,
-              Builtins.tostring(Ops.get(value, [0, "content"]))
-            )
-          elsif key == "archs"
-            Builtins.foreach(
-              Convert.convert(value, :from => "list", :to => "list <map>")
-            ) { |one_arch| Builtins.foreach(Ops.get_list(one_arch, "arch", 
[])) do |xone_arch|
-              Ops.set(
-                one_entry,
-                "archs",
-                Builtins.add(
-                  Ops.get_list(one_entry, "archs", []),
-                  Ops.get_string(xone_arch, "content", "")
-                )
-              )
-            end }
-          else
-            Builtins.y2error("Unknown key: %1", key)
-          end
-        end
-        counter = Ops.add(counter, 1)
-        Ops.set(ret_list, counter, one_entry)
-      end
-
-      nr_packages_found = Builtins.size(ret_list)
-
-      if nr_packages_found == nil || nr_packages_found == 0
-        Builtins.y2warning("Nothing found")
-      else
-        Builtins.y2milestone("%1 packages found", nr_packages_found)
-      end
-
-      deep_copy(ret_list)
-    end
-
-    publish :function => :SetBaseSearchURL, :type => "void (string)"
-    publish :function => :GetBaseSearchURL, :type => "string ()"
-    publish :function => :MatchesCurrentArchitecture, :type => "boolean (list 
<string>)"
-    publish :function => :PrepareOneClickInstallDescription, :type => "boolean 
(list <map>, string)"
-    publish :function => :SearchForPackages, :type => "list <map> (string, 
string, map <string, boolean>)"
-  end
-
-  WebpinPackageSearch = WebpinPackageSearchClass.new
-  WebpinPackageSearch.main
-end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-packager-3.1.0/testsuite/tests/Packages.out 
new/yast2-packager-3.1.0/testsuite/tests/Packages.out
--- old/yast2-packager-3.1.0/testsuite/tests/Packages.out       2013-10-15 
15:54:19.000000000 +0200
+++ new/yast2-packager-3.1.0/testsuite/tests/Packages.out       2013-11-08 
12:49:48.000000000 +0100
@@ -15,8 +15,8 @@
 Read   .target.string "/proc/cmdline" "install=cd:// vga=0x314 biosdevname=0"
 Return []
 Read   .target.string "/proc/cmdline" "install=cd:// vga=0x314"
-Execute        .target.bash_output "/usr/sbin/hwinfo --bios" $["exit":0, 
"stderr":"", "stdout":"  BIOS Info: #0\n    Vendor: \"Dell Inc.\"\n        
Version: \"A03\""]
+Execute        .target.bash "/usr/sbin/hwinfo --bios | grep -q 
'^[[:space:]]*Vendor:.*Dell Inc\\.'" 0
 Return ["biosdevname"]
 Read   .target.string "/proc/cmdline" "install=cd:// vga=0x314"
-Execute        .target.bash_output "/usr/sbin/hwinfo --bios" $["exit":0, 
"stderr":"", "stdout":"  BIOS Info: #0\n    Vendor: \"FooBar Inc.\"\n        
Version: \"001\""]
+Execute        .target.bash "/usr/sbin/hwinfo --bios | grep -q 
'^[[:space:]]*Vendor:.*Dell Inc\\.'" 1
 Return []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-packager-3.1.0/testsuite/tests/Packages.rb 
new/yast2-packager-3.1.0/testsuite/tests/Packages.rb
--- old/yast2-packager-3.1.0/testsuite/tests/Packages.rb        2013-10-15 
15:54:19.000000000 +0200
+++ new/yast2-packager-3.1.0/testsuite/tests/Packages.rb        2013-11-08 
12:49:48.000000000 +0100
@@ -63,28 +63,16 @@
       # a Dell system
       Ops.set(
         @EXEC,
-        ["target", "bash_output"],
-        {
-          "exit"   => 0,
-          "stdout" => "  BIOS Info: #0\n" +
-            "    Vendor: \"Dell Inc.\"\n" +
-            "        Version: \"A03\"",
-          "stderr" => ""
-        }
+        ["target", "bash"],
+        0
       )
       TEST(lambda { Packages.kernelCmdLinePackages }, [@READ, {}, @EXEC], nil)
 
       # a non-Dell system
       Ops.set(
         @EXEC,
-        ["target", "bash_output"],
-        {
-          "exit"   => 0,
-          "stdout" => "  BIOS Info: #0\n" +
-            "    Vendor: \"FooBar Inc.\"\n" +
-            "        Version: \"001\"",
-          "stderr" => ""
-        }
+        ["target", "bash"],
+        1
       )
       TEST(lambda { Packages.kernelCmdLinePackages }, [@READ, {}, @EXEC], nil)
 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to