Improved generation of filter subscription files

sitescripts/subscriptions/bin/updateSubscriptionDownloads.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2013 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
@@ skipping 32 matching lines @@
 
 if __name__ == "__main__":
   setupStderr()
 
   source_repos = {}
   for option, value in get_config().items("subscriptionDownloads"):
     if option.endswith("_repository"):
       source_repos[re.sub(r"_repository$", "", option)] = MercurialSource(value)
 
   basedir = get_config().get("subscriptionDownloads", "outdir")
-  destination = tempfile.mkdtemp(prefix="data.", dir=basedir)
+  destination = os.path.join(basedir, "data")
   try:
-    combine_subscriptions(source_repos, destination)
-  except:
-    shutil.rmtree(destination, ignore_errors=True)
-    raise
+    combine_subscriptions(source_repos, destination, tempdir=basedir)
   finally:
     for source in source_repos.itervalues():
       source.close()
-
-  symbolic_link = os.path.join(basedir, "data")
-  symbolic_link_tmp = os.path.join(basedir, "data~")
-  orig_data = None
-  if os.path.islink(symbolic_link):
-    orig_data = os.path.join(basedir, os.readlink(symbolic_link))
-
-  os.symlink(os.path.relpath(destination, basedir), symbolic_link_tmp)
-  os.rename(symbolic_link_tmp, symbolic_link)
-
-  if orig_data:
-    shutil.rmtree(orig_data)