Merge branch 'master' into supportconfig-plugin

Makefile

@@ -1,5 +1,5 @@
 NAME          = rmt-server
-VERSION       = 0.0.6
+VERSION       = 0.0.7
 
 all:
 	@:

lib/rmt.rb

@@ -1,5 +1,5 @@
 module RMT
-  VERSION ||= '0.0.6'.freeze
+  VERSION ||= '0.0.7'.freeze
 
   DEFAULT_USER = '_rmt'.freeze
   DEFAULT_GROUP = 'nginx'.freeze

lib/rmt/cli/export.rb

@@ -35,7 +35,7 @@ def repos(path)
       repos.each do |repo|
         puts "Mirroring repository at #{repo['url']}"
         begin
-          RMT::Mirror.from_url(repo['url'], repo['auth_token'], base_dir: path).mirror
+          RMT::Mirror.from_url(repo['url'], repo['auth_token'], base_dir: path, to_offline: true).mirror
         rescue RMT::Mirror::Exception => e
           warn e.to_s
         end

package/rmt-server.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Apr 25 14:47:18 UTC 2018 - tmuntaner@suse.com
+
+- version 0.0.7
+- Fixed offline repository sync with usb (bsc#1089038)
+  See: https://github.com/SUSE/rmt/pull/147
+- Removed unique index for uuid in HwInfo table
+  See: https://github.com/SUSE/rmt/pull/142
+- "rmt-cli products enable ..." enables recommended extensions in SLE 15
+  See: https://github.com/SUSE/rmt/pull/141
+- Added RMT header in requests for Connect API
+  See: https://github.com/SUSE/rmt/pull/139
+
 -------------------------------------------------------------------
 Thu Apr 19 15:09:41 UTC 2018 - skotov@suse.com
 

package/rmt-server.spec

@@ -27,10 +27,10 @@
 %define rmt_group   nginx
 
 Name:           rmt-server
-Version:        0.0.6
+Version:        0.0.7
 Release:        0
 Summary:        Repository mirroring tool and registration proxy for SCC
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Productivity/Networking/Web/Proxy
 Url:            https://software.opensuse.org/package/rmt
 # Does not build for i586 and s390 and is not supported on those architectures

spec/lib/rmt/cli/export_spec.rb

@@ -65,8 +65,8 @@
 
     context 'with valid repo ids' do
       before do
-        expect(RMT::Mirror).to receive(:from_url).with('http://foo.bar/repo1', 'foobar', base_dir: path).once.and_return(mirror_double)
-        expect(RMT::Mirror).to receive(:from_url).with('http://foo.bar/repo2', '', base_dir: path).once.and_return(mirror_double)
+        expect(RMT::Mirror).to receive(:from_url).with('http://foo.bar/repo1', 'foobar', base_dir: path, to_offline: true).once.and_return(mirror_double)
+        expect(RMT::Mirror).to receive(:from_url).with('http://foo.bar/repo2', '', base_dir: path, to_offline: true).once.and_return(mirror_double)
       end
 
       it 'reads repo ids from file at path and mirrors these repos' do