six-updater-web 0.14.4 → 0.14.5

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = 'six-updater-web'
-  s.version = '0.14.4'
+  s.version = '0.14.5'
   s.has_rdoc = false
   #s.extra_rdoc_files = ['README', 'LICENSE']
   s.summary = 'Your summary here'

data/lib/six-updater-web/app/models/system_setting.rb

@@ -37,7 +37,7 @@ class SystemSetting < ActiveRecord::Base
       status = Timeout::timeout(TIMEOUT) do
         Six::Network::Panel.login(self.server_username, self.server_password, true)
       end
-      [Network, Mod, Server, Repository, Action, Appsetting, Sixconfig].each do |t|
+      [Mod, Network, Server, Repository, Action, Appsetting, Sixconfig].each do |t|
         l += t.imp
       end
     rescue Timeout::Error

data/lib/six-updater-web/common.rb

@@ -1,6 +1,4 @@
 # encoding: utf-8
-# Set default encoding
-Encoding.default_internal, Encoding.default_external = ['utf-8'] * 2
 
 require 'fileutils'
 

data/lib/six-updater-web/config/six-updater-web.rb

@@ -1,5 +1,8 @@
 # encoding: utf-8
 
+# Set default encoding
+Encoding.default_internal, Encoding.default_external = ['utf-8'] * 2
+
 case RUBY_PLATFORM
   when /-mingw32$/, /-mswin32$/
     gem 'win32-process'
@@ -19,7 +22,7 @@ case RUBY_VERSION
 end
 
 module SixUpdaterWeb
-  VERSION = "0.14.4"
+  VERSION = "0.14.5"
   COMPONENT = "six-updater-web"
 
   DEFAULT_IP = "127.0.0.1" unless defined?(DEFAULT_IP)

data/lib/six-updater-web/vendor/plugins/six-import/lib/six/import.rb

@@ -100,7 +100,11 @@ module Six
           if h["id"]
             id = h["id"]
             h.delete "id"
-            r = self.find(id)
+            r = nil
+            begin
+              r = self.find(id)
+            rescue
+            end
             if r
               previous = r.inspect
               r.attributes = h

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 14
-  - 4
-  version: 0.14.4
+  - 5
+  version: 0.14.5
 platform: ruby
 authors: 
 - Sickboy