Merge pull request #216 from ancorgs/merge-master

Sync the storage-ng branch with master

.rspec

@@ -0,0 +1 @@
+--color --format doc

.travis.yml

@@ -5,10 +5,7 @@ before_install:
     # disable rvm, use system Ruby
     - rvm reset
     - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh
-    - sh ./travis_setup.sh -p "yast2-devtools yast2-testsuite yast2 yast2-pkg-bindings yast2-country-data" -g rspec:3.3.0
+    - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2 yast2-pkg-bindings" -g "rspec:3.3.0 yast-rake simplecov coveralls cheetah"
 script:
-    - make -f Makefile.cvs
-    - make
-    - sudo make install
-    - make check
-
+    - sudo rake install
+    - COVERAGE=1 rake test:unit

CONTRIBUTING.md

@@ -3,7 +3,7 @@ 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.
+ensure the process is effective and pleasant both for you and the YaST maintainers.
 
 There are two main forms of contribution: reporting bugs and performing code
 changes.
@@ -17,13 +17,11 @@ 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.suse.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).
 
+We can't guarantee that every bug will be fixed, but we'll try.
+
 Code Changes
 ------------
 
@@ -44,25 +42,29 @@ follows:
      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
+  4. Update the package version (in `packages/*.spec`, usually by
+     `rake version:bump`) and add a new entry to the `package/*.changes` file
+     (by `osc vc package`).  
+     For bigger changes or changes which need longer discussion it is advised to
+     add this as a separate last commit so it can be easily updated when another
+     change is merged in the meantime.
+
+  5. 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. Publish the branch and create a pull request.
 
-  6. YaST developers will review your change and possibly point out issues.
+  7. 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.
+  8. 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

Dockerfile

@@ -0,0 +1,3 @@
+FROM yastdevel/ruby-tw
+COPY . /tmp/sources
+

README.md

@@ -2,4 +2,5 @@
 
 [![Travis Build](https://travis-ci.org/yast/yast-packager.svg?branch=master)](https://travis-ci.org/yast/yast-packager)
 [![Jenkins Build](http://img.shields.io/jenkins/s/https/ci.opensuse.org/yast-packager-master.svg)](https://ci.opensuse.org/view/Yast/job/yast-packager-master/)
+[![Coverage Status](https://coveralls.io/repos/yast/yast-packager/badge.png)](https://coveralls.io/r/yast/yast-packager)
 

Rakefile

@@ -7,4 +7,5 @@ Yast::Tasks.configuration do |conf|
   conf.obs_project = "YaST:storage-ng"
   # Make sure 'rake osc:sr' fails
   conf.obs_sr_project = nil
+  conf.install_locations["desktop/*.desktop"] = Packaging::Configuration::DESTDIR + "/usr/share/applications"
 end

package/yast2-packager.changes

@@ -1,3 +1,159 @@
+-------------------------------------------------------------------
+Mon Jan 16 11:22:15 UTC 2017 - ancor@suse.com
+
+- storage-ng: version temporarily bumped to 3.3.x to prioritize
+  this branch
+- 3.3.1
+
+-------------------------------------------------------------------
+Thu Dec  1 08:03:05 UTC 2016 - lslezak@suse.cz
+
+- Mark the selected default patterns as optional so the user can
+  change them without blocking the installation later (fixes
+  openQA tests) (related to bsc#885496)
+- 3.2.10
+
+-------------------------------------------------------------------
+Fri Nov 25 10:37:11 UTC 2016 - jreidinger@suse.com
+
+- Revert the last change, as it is more tricky to get the correct
+  behavior. For more details see the discussion in (bsc#966466).
+- 3.2.9
+
+-------------------------------------------------------------------
+Thu Nov 24 13:04:32 UTC 2016 - jreidinger@suse.com
+
+- Always show summary mode when clicking on details in software
+  proposal (bsc#966466)
+- 3.2.8
+
+-------------------------------------------------------------------
+Tue Nov 15 11:58:58 UTC 2016 - jreidinger@suse.com
+
+- Use a non-blocking error in the installation proposal for not
+  enough space issue during upgrade instead of just warning as it
+  can be easier to overlook by an user
+  (bsc#1003682)
+- 3.2.7
+
+-------------------------------------------------------------------
+Mon Nov 14 11:40:56 UTC 2016 - lslezak@suse.cz
+
+- Software proposal: display an error when a package or a pattern
+  required by YaST has been deselected by user, implement a generic
+  solution for bsc#885496
+- 3.2.6
+
+-------------------------------------------------------------------
+Mon Oct 24 14:54:59 CEST 2016 - schubi@suse.de
+
+- Faking /etc/mtab on target system for post RPM installation
+  actions which depend on it, e.g. checking if there is a /home
+  directory. (bnc#995299)
+- 3.2.5
+
+-------------------------------------------------------------------
+Mon Oct 17 07:41:00 UTC 2016 - lslezak@suse.cz
+
+- Update the priority for the loaded packages when starting the
+  repository manager from the package manager (bsc#498266)
+- 3.2.4
+
+-------------------------------------------------------------------
+Fri Oct 14 11:03:49 UTC 2016 - jreidinger@suse.com
+
+- allow SLES for SAP upgrade from 11 to 12 as it is renamed
+  (bsc#1004665)
+- 3.2.3
+
+-------------------------------------------------------------------
+Mon Oct 10 14:07:57 UTC 2016 - lslezak@suse.cz
+
+- Do not ask for a CD when the add-on check box is unchecked
+  (bsc#955186)
+- 3.2.2
+
+-------------------------------------------------------------------
+Thu Oct  6 08:01:38 UTC 2016 - lslezak@suse.cz
+
+- Disable autorefresh for newly added local repositories ("cd",
+  "dvd", "dir", "hd" (including USB flash), "iso" and "file" URL
+  protocols) (bsc#948982)
+- 3.2.1
+
+-------------------------------------------------------------------
+Wed Oct  5 14:35:07 UTC 2016 - jreidinger@suse.com
+
+- remove workaround that creates fake mtab to prevent collision
+  with real one (bsc#1002978)
+- 3.2.0
+
+-------------------------------------------------------------------
+Mon Oct  3 16:38:36 UTC 2016 - jreidinger@suse.com
+
+- prevent double URL encoding for ISO (bsc#954813)
+- 3.1.118
+
+-------------------------------------------------------------------
+Wed Aug 31 14:25:19 UTC 2016 - igonzalezsosa@suse.com
+
+- Fix URLs handling when retrying to load an add-on from a CD/DVD
+  through the add_on_products.xml (related to bsc#991935).
+- 3.1.117
+
+-------------------------------------------------------------------
+Tue Aug 23 11:17:36 UTC 2016 - jreidinger@suse.com
+
+- Always enable "Next" button in license confirmation dialog,
+  because even if not accepted, popup is shown to user
+  (bnc#993530).
+- Use the same popup when license not confirmed for base product in
+  the license confirmation dialog (bnc#993530).
+- 3.1.116
+
+-------------------------------------------------------------------
+Thu Aug 18 10:55:06 CEST 2016 - schubi@suse.de
+
+- Do not raise an exception if no license is available (no licence
+  dir at all) to accept (bnc#994309).
+- 3.1.115
+
+-------------------------------------------------------------------
+Tue Aug 16 14:16:01 UTC 2016 - lslezak@suse.cz
+
+- Remove the icon from the add-on selection popup (bsc#875201)
+- 3.1.114
+
+-------------------------------------------------------------------
+Tue Aug 16 08:31:23 CEST 2016 - locilka@suse.com
+
+- Added lazy loading of licenses into AcceptanceNeeded in case of
+  base product in the initial installation to fix a problem when
+  explicit acceptance of the product license was always required
+  (bnc#993285)
+- 3.1.113
+
+-------------------------------------------------------------------
+Mon Aug 15 13:59:58 CEST 2016 - schubi@suse.de
+
+- Fixed parameter error while logging errors. It belongs to
+  bnc#991935.
+- 3.1.112
+
+-------------------------------------------------------------------
+Thu Aug 11 12:23:47 UTC 2016 - igonzalezsosa@suse.com
+
+- Fix automatic add-on handling when using CD/DVD medias as source
+  (bsc#991935)
+- 3.1.111
+
+-------------------------------------------------------------------
+Wed Aug 10 16:39:10 UTC 2016 - kanderssen@suse.com
+
+- List addons below base product in Software proposal during
+  installation. (bsc#992304)
+- 3.1.110
+
 -------------------------------------------------------------------
 Tue Aug  9 14:23:51 UTC 2016 - ancor@suse.com