From f3e30fa440d19865fb1d4db492d8bb6b4148c139 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 22 Nov 2005 01:22:56 +0000 Subject: Get it working git-svn-id: file:///home/lennart/svn/public/sse/trunk@21 5fbabb74-0606-0410-a5e4-b5cc6a42724e --- feed/sse_debian.py | 8 +++++++- feed/sse_tar.py | 5 +++-- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'feed') diff --git a/feed/sse_debian.py b/feed/sse_debian.py index ec0cabe..f948d12 100755 --- a/feed/sse_debian.py +++ b/feed/sse_debian.py @@ -7,6 +7,9 @@ SSE_RELEASE = "main" import sys +from sse_defs import * +import sse_grab + def process_entry(entry): for k, v in entry.items(): @@ -27,7 +30,10 @@ def process_entry(entry): meta["archive-url"] = SSE_DEBIAN_URL + entry["Directory"] + "/" + meta["archive"] meta["license"] = "DFSG approved" meta["project-url"] = "http://packages.debian.org/cgi-bin/search_packages.pl?searchon=sourcenames&version="+ SSE_DISTRIBUTION + "&exact=1&keywords=" + entry["Package"] + "&release=" + SSE_RELEASE - print meta + + print "Next record '%s'" % meta["name"] + + sse_grab.grab_archive(meta, "debian:" + meta["name"], SSE_PROVIDER_DEBIAN) def process_list(f): diff --git a/feed/sse_tar.py b/feed/sse_tar.py index ea94ca4..bf3cb8e 100755 --- a/feed/sse_tar.py +++ b/feed/sse_tar.py @@ -120,6 +120,8 @@ def process_archive(archive, meta = {}, recid = None, provider_id = SSE_PROVIDER md = calc_md(archive) meta["md"] = md + root = os.path.join(HOME, "sources", md) + sse_db.start_transaction() try: @@ -140,8 +142,6 @@ def process_archive(archive, meta = {}, recid = None, provider_id = SSE_PROVIDER if not recid is None: sse_db.new_provider_record(recid, package_id, provider_id, meta) - root = os.path.join(HOME, "sources", md) - try: rm_rf(root) except: @@ -164,6 +164,7 @@ def process_archive(archive, meta = {}, recid = None, provider_id = SSE_PROVIDER except Exception, e: sse_db.rollback() + raise e if __name__ == "__main__": process_archive(sys.argv[1]) -- cgit