Merge branch 'master' into sqlalchemy

In the mean time, the master branch evolved quite a bit and the schema
changed again (eqclass added to function table). The main reason for the
merge is to resolve the large amounts of conflicts once, so development
of the sqlalchemy branch can continue and still benefit from changes in
the master branch such as schema compatibility, adapting the indent
level in web app due to the use of contextlib.closing which resembles
sqlalchemy's "with db.begin() as conn:".

Conflicts:
	autoimport.py
	dedup/utils.py
	readyaml.py
	update_sharing.py
	webapp.py

1 files changed, 7 insertions, 1 deletions

diff --git a/readyaml.py b/readyaml.py
index 835967d..15cfcb3 100755
--- a/readyaml.py
+++ b/readyaml.py
@@ -2,6 +2,7 @@
 """This tool reads a yaml file as generated by importpkg.py on stdin and
 updates the database with the contents."""
 
+import optparse
 import sys
 
 from debian.debian_support import version_compare
@@ -57,7 +58,12 @@ def readyaml(conn, stream):
     raise ValueError("missing commit block")
 
 def main():
-    db = sqlalchemy.create_engine("sqlite:///test.sqlite3")
+    parser = optparse.OptionParser()
+    parser.add_option("-d", "--database", action="store",
+                      default="sqlite:///test.sqlite3",
+                      help="location of the database")
+    options, args = parser.parse_args()
+    db = sqlalchemy.create_engine(options.database)
     enable_sqlite_foreign_keys(db)
     with db.begin() as conn:
         readyaml(conn, sys.stdin)