Bläddra i källkod

Merge branch 'master' of https://github.com/pwman3/pwman3

oz123 11 år sedan
förälder
incheckning
a2d7299a51
3 ändrade filer med 10 tillägg och 0 borttagningar
  1. 5 0
      ChangeLog
  2. 1 0
      pwman/data/factory.py
  3. 4 0
      scripts/pwman3

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+2014-Feb-27 Oz Nahum <nahumoz@gmail.com>
+	* Version 0.4.5 
+	* Fix for old database format
+	* The tag is on commit 5304181711797bb2da68addc18b97740f6540da3
+
 2014-Feb-25 Oz Nahum <nahumoz@gmail.com>
 	* Version 0.4.4
 	* Multiple bug fixes 

+ 1 - 0
pwman/data/factory.py

@@ -32,6 +32,7 @@ db.open()
 """
 from pwman.data.database import DatabaseException
 from pwman.data.drivers import sqlite
+#from pwman.data.drivers import osqlite
 
 
 def check_db_version(type):

+ 4 - 0
scripts/pwman3

@@ -137,6 +137,10 @@ try:
     db = pwman.data.factory.create(dbtype, dbver)
     if dbver >= 0.4:
         cli = PwmanCliNew(db, xselpath, CLICallback)
+    elif dbver < 0.4:
+        cli = PwmanCli(db, xselpath)
+        print cli._dbwarning
+        sys.exit(0)
 except SystemExit, e:
     sys.exit(e)