summaryrefslogtreecommitdiff
path: root/readyaml.py
diff options
context:
space:
mode:
authorHelmut Grohne <helmut@subdivi.de>2013-09-07 21:04:40 +0200
committerHelmut Grohne <helmut@subdivi.de>2013-09-07 21:04:40 +0200
commit7f3d8c5098d23bb43b86e060700170cc41cd22aa (patch)
tree5e0ee4d269259b4b0d205d1f89895d8f46cccf93 /readyaml.py
parent49cac8bdae0ec787372d227545411ef14905d6a8 (diff)
downloaddebian-dedup-7f3d8c5098d23bb43b86e060700170cc41cd22aa.tar.gz
permit multiple architectures per package
While the importer can easily cope with this change, the web presentation still needs fixing. It works somewhat now.
Diffstat (limited to 'readyaml.py')
-rwxr-xr-xreadyaml.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/readyaml.py b/readyaml.py
index 2ef9a3b..cd9e5db 100755
--- a/readyaml.py
+++ b/readyaml.py
@@ -15,8 +15,8 @@ def readyaml(db, stream):
gen = yaml.safe_load_all(stream)
metadata = next(gen)
package = metadata["package"]
- cur.execute("SELECT id, version FROM package WHERE name = ?;",
- (package,))
+ cur.execute("SELECT id, version FROM package WHERE name = ? AND architecture = ?;",
+ (package, metadata["architecture"]))
row = cur.fetchone()
if row:
pid, version = row
@@ -31,8 +31,8 @@ def readyaml(db, stream):
if pid is not None:
cur.execute("DELETE FROM content WHERE pid = ?;", (pid,))
cur.execute("DELETE FROM dependency WHERE pid = ?;", (pid,))
- cur.execute("UPDATE package SET version = ?, architecture = ?, source = ? WHERE id = ?;",
- (metadata["version"], metadata["architecture"], metadata["source"], pid))
+ cur.execute("UPDATE package SET version = ?, source = ? WHERE id = ?;",
+ (metadata["version"], metadata["source"], pid))
else:
cur.execute("INSERT INTO package (name, version, architecture, source) VALUES (?, ?, ?, ?);",
(package, metadata["version"], metadata["architecture"],