Merge branch 'master' into self-update

* master:
  Fix some issues pointed by Rubocop
  Move Yast::Transfer::FileFromUrl from yast2-update
  Add FileFromUrl from yast2-update

.travis.yml

@@ -5,7 +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 "rake yast2-devtools yast2-testsuite yast2-core-dev yast2 yast2-network" -g "rspec:3.3.0 yast-rake gettext rubocop:0.29.1 simplecov coveralls"
+    - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2-core-dev yast2 yast2-network yast2-transfer" -g "rspec:3.3.0 yast-rake gettext rubocop:0.29.1 simplecov coveralls"
 script:
     - rake check:syntax
     - rake check:pot

package/yast2-installation.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Mar 14 09:39:50 UTC 2016 - igonzalezsosa@suse.com
+
+- Moved Yast::Transfer::FileFromUrl here from yast2-update
+  (FATE#319716).
+- 3.1.173
+
 -------------------------------------------------------------------
 Fri Mar  4 14:24:49 UTC 2016 - mvidner@suse.com
 

package/yast2-installation.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        3.1.172
+Version:        3.1.173
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -206,6 +206,7 @@ systemctl enable YaST2-Firstboot.service
 %dir %{yast_yncludedir}/installation
 %{yast_yncludedir}/installation/*
 %{yast_libdir}/installation
+%{yast_libdir}/transfer
 
 # agents
 %{yast_scrconfdir}/etc_passwd.scr

src/Makefile.am

@@ -118,6 +118,10 @@ ylib_DATA = \
   lib/installation/snapshots_finish.rb \
   lib/installation/updates_manager.rb
 
+ylibtransferdir = "${yast2dir}/lib/transfer"
+ylibtransfer_DATA = \
+  lib/transfer/file_from_url.rb
+
 ylibclientdir = "${yast2dir}/lib/installation/clients"
 ylibclient_DATA = \
   lib/installation/clients/copy_files_finish.rb \
@@ -180,6 +184,6 @@ ylibclient_DATA = \
   lib/installation/clients/x11_finish.rb \
   lib/installation/clients/yast_inf_finish.rb
 
-EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(schemafiles_DATA) $(desktop_DATA) $(fillup_DATA) $(ylib_DATA)
+EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(schemafiles_DATA) $(desktop_DATA) $(fillup_DATA) $(ylib_DATA) $(ylibtransfer_DATA)
 
 include $(top_srcdir)/Makefile.am.common