--- a/dbrtools/dbr/dbrbaseline.py	Tue Mar 16 12:28:04 2010 +0000
+++ b/dbrtools/dbr/dbrbaseline.py	Wed Mar 17 12:27:45 2010 +0000
@@ -135,22 +135,5 @@
 
 
 def readzippeddb(drive):
-  env = dict()
-  #Note that this is really crude. I'm seeing if it'll work before cleaning things up...
-  #see if we have a build_md5.zip file
-  md5zip = os.path.join(drive,'build_md5.zip')
-  temp_dir = tempfile.mkdtemp()
-  print temp_dir 
-  if(os.path.exists(md5zip)):
-    files = set();
-    files.add('*')
-    dbrutils.extractfromzip(files,md5zip,temp_dir)
-    globsearch = os.path.join(temp_dir, os.path.join(dbrutils.patch_path_internal(),'*.md5'))
-    print globsearch 
-    hashes = glob.glob(globsearch)
-    for file in hashes:
-        print 'Reading: %s\n' % file
-        dbrutils.gethashes(env, file, True)
-  shutil.rmtree(temp_dir)
-  return env
+  return dbrutils.getzippedDB(drive)