Merge lp:~juliank/ddeb-retriever/misc-fixes into lp:ddeb-retriever

[Julian Andres Klode]

Reduce the retention period from 30 days to 7 days, as 30 days seems like overkill.

Fix the test suite for archive_tools

[lp:~juliank/ddeb-retriever/misc-fixes]

177. By Julian Andres Klode on 2018-02-16

archive_tools.py: Import urllib.request instead of urllib, so tests work again

178. By Julian Andres Klode on 2018-02-16

ddeb_retriever.py: Only retain files for 7 days

The 30 day retention period seems like overkill. some believe that this
was due to lagging error retracers, but these fetch directly from librarian
now, so let's drop it down to 7 days.

[Brian Murray (brian-murray)]

Could you elaborate about your comment regarding the error retracers? While apport-retrace will fallback to getting ddebs from Launchpad it first uses ddebs.ubuntu.com.

[Julian Andres Klode (juliank)]

Brian, I think it was infinity who said that this seems like an awful long time to keep this stuff around and that it's no longer needed, hence I reduced it. We don't have to pick that change, it just made sense based on these comments.

[Steve Langasek (vorlon)]

If this is still wanted, please resubmit against https://code.launchpad.net/~ubuntu-archive/ddeb-retriever/+git/ddeb-retriever

review: Disapprove

Unmerged revisions

178. By Julian Andres Klode on 2018-02-16

ddeb_retriever.py: Only retain files for 7 days

The 30 day retention period seems like overkill. some believe that this
was due to lagging error retracers, but these fetch directly from librarian
now, so let's drop it down to 7 days.

177. By Julian Andres Klode on 2018-02-16

archive_tools.py: Import urllib.request instead of urllib, so tests work again

=== modified file 'archive_tools.py'
--- archive_tools.py	2017-05-23 23:46:10 +0000
+++ archive_tools.py	2018-02-16 22:47:30 +0000
@@ -11,7 +11,7 @@
 '''
 
 import apt_pkg
-import urllib
+import urllib.request
 import os
 import gzip
 import bz2

=== modified file 'ddeb_retriever.py'
--- ddeb_retriever.py	2018-02-13 15:24:27 +0000
+++ ddeb_retriever.py	2018-02-16 22:47:30 +0000
@@ -263,6 +263,6 @@
 
     if not args.no_clean and installed_pockets:
         logging.info('Cleaning up archive...')
-        archive_tools.archive_cleanup(args.archive_root, 30)
+        archive_tools.archive_cleanup(args.archive_root, 7)
 
     os.close(lockfd)