From c6ddcbfafd4e25daa906010ad289ec52887af0f9 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@cd1c1023-2f26-0410-ae45-c471fc1f0318>
Date: Thu, 15 Nov 2007 16:55:36 +0000
Subject: [PATCH] two fixes for the latest changes

git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@688 cd1c1023-2f26-0410-ae45-c471fc1f0318
---
 libraries/databaseTools.py | 6 +++++-
 libraries/reagentTools.py  | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libraries/databaseTools.py b/libraries/databaseTools.py
index 438d74e58..41e1c2289 100644
--- a/libraries/databaseTools.py
+++ b/libraries/databaseTools.py
@@ -494,7 +494,11 @@ class etpDatabase:
 	self.checkReadOnly()
 	
 	if revision == -1:
-	    revision = etpData['revision']
+            try:
+	       revision = etpData['revision']
+            except:
+                etpData['revision'] = 0 # revision not specified
+                revision = 0
 
 	dbLog.log(ETP_LOGPRI_INFO,ETP_LOGLEVEL_VERBOSE,"addPackage: called.")
 	
diff --git a/libraries/reagentTools.py b/libraries/reagentTools.py
index 11acc987c..ed187b2ce 100644
--- a/libraries/reagentTools.py
+++ b/libraries/reagentTools.py
@@ -64,7 +64,7 @@ def generator(package, dbconnection = None, enzymeRequestBranch = etpConst['bran
     
     # update latest counter
     f = open(edbCOUNTER,"r")
-    counter = int(f.readline.strip())
+    counter = int(f.readline().strip())
     f.close()
     dbconn.setLatestCounter(counter)