fix misses.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@469 4e526526-5e11-4fc0-8910-f8fd03428081

diff --git a/rec10/trunk/src/install.py b/rec10/trunk/src/install.py
index 923967f..05052d5 100644 (file)
--- a/rec10/trunk/src/install.py
+++ b/rec10/trunk/src/install.py
@@ -9,11 +9,10 @@ import sys
 import commands
 import configwriter
 import shutil
-import status
 
 import recdblist
 def install():
-    version = status.version
+    version = recdblist.version
     recdblist.printutf8(u"rec10の環境インストールを開始します。")
     time.sleep(1)
     recdblist.printutf8(u"環境インストール処理中・・・")

diff --git a/rec10/trunk/src/recdblist.py b/rec10/trunk/src/recdblist.py
index 7d1bc29..fc17c4a 100644 (file)
--- a/rec10/trunk/src/recdblist.py
+++ b/rec10/trunk/src/recdblist.py
@@ -68,6 +68,7 @@ REC_AUTO_SUGGEST_AP2FP = "auto_suggest_ap2fp"
 REC_AUTO_KEYWORD = "auto_keyword"
 REC_BAYES_SUGGEST ="bayes_suggest"
 
+version = 93
 def printutf8(unicode):
     print unicode.encode('utf-8')
 def addlog(tspath,txt,log_title):

diff --git a/rec10/trunk/src/status.py b/rec10/trunk/src/status.py
index 44f1240..f5fb4a3 100755 (executable)
--- a/rec10/trunk/src/status.py
+++ b/rec10/trunk/src/status.py
@@ -6,7 +6,6 @@ import configreader
 import os
 import rec10d
 path = os.path.dirname(os.path.abspath(__file__)) + "/"
-version = 93
 def changeEncoding(i):
     """
     iはint　増減

diff --git a/rec10/trunk/src/timerec.py b/rec10/trunk/src/timerec.py
index 7889c67..5df5793 100644 (file)
--- a/rec10/trunk/src/timerec.py
+++ b/rec10/trunk/src/timerec.py
@@ -33,7 +33,7 @@ def task():
     予定によって子プロセスを生成し処理する。
     """
     try:
-        if rec10d.rec10db.select_installed_in_status()==0 or rec10d.rec10db.select_version_in_status()<status.version:
+        if rec10d.rec10db.select_installed_in_status()==0 or rec10d.rec10db.select_version_in_status()<recdblist.version:
             install.install()
     except:
         install.install()