diff -Nru click-reviewers-tools-0.10/bin/clickreviews/apparmor_policy.py click-reviewers-tools-0.10/bin/clickreviews/apparmor_policy.py --- click-reviewers-tools-0.10/bin/clickreviews/apparmor_policy.py 2014-09-10 21:01:45.000000000 +0000 +++ click-reviewers-tools-0.10/bin/clickreviews/apparmor_policy.py 2014-09-23 20:16:17.000000000 +0000 @@ -27,7 +27,8 @@ def get_policy_file(fn): if fn is None: fn = USER_DATA_FILE - clickreviews.remote.get_remote_file(fn, AA_POLICY_DATA_URL) + file_url = clickreviews.remote.get_remote_file_url(AA_POLICY_DATA_URL) + clickreviews.remote.get_remote_file(fn, file_url) class ApparmorPolicy(object): diff -Nru click-reviewers-tools-0.10/bin/clickreviews/cr_security.py click-reviewers-tools-0.10/bin/clickreviews/cr_security.py --- click-reviewers-tools-0.10/bin/clickreviews/cr_security.py 2014-09-10 21:01:45.000000000 +0000 +++ click-reviewers-tools-0.10/bin/clickreviews/cr_security.py 2014-09-23 20:16:17.000000000 +0000 @@ -59,7 +59,8 @@ 'read_path', 'template_variables', 'write_path'] - self.allowed_webapp_policy_groups = ['audio', + self.allowed_webapp_policy_groups = ['accounts', + 'audio', # 'camera', non-functional ATM 'content_exchange', 'location', diff -Nru click-reviewers-tools-0.10/bin/clickreviews/frameworks.py click-reviewers-tools-0.10/bin/clickreviews/frameworks.py --- click-reviewers-tools-0.10/bin/clickreviews/frameworks.py 2014-09-10 21:01:45.000000000 +0000 +++ click-reviewers-tools-0.10/bin/clickreviews/frameworks.py 2014-09-23 20:16:17.000000000 +0000 @@ -17,10 +17,8 @@ import clickreviews.remote USER_DATA_FILE = os.path.join(clickreviews.remote.DATA_DIR, 'frameworks.json') - -# XXX: This is a hack and will be gone, as soon as myapps has an API for this. FRAMEWORKS_DATA_URL = \ - "http://bazaar.launchpad.net/~ubuntu-core-dev/+junk/frameworks/view/head:/frameworks.json" + "https://myapps.developer.ubuntu.com/dev/api/click-framework/" def get_frameworks_file(fn): diff -Nru click-reviewers-tools-0.10/bin/clickreviews/remote.py click-reviewers-tools-0.10/bin/clickreviews/remote.py --- click-reviewers-tools-0.10/bin/clickreviews/remote.py 2014-09-10 21:01:45.000000000 +0000 +++ click-reviewers-tools-0.10/bin/clickreviews/remote.py 2014-09-23 20:16:17.000000000 +0000 @@ -52,14 +52,20 @@ # # Public # -def get_remote_file(fn, url, data_dir=DATA_DIR): +def get_remote_data(url): try: f = request.urlopen(url) except (HTTPError, URLError) as error: abort('Data not retrieved because %s.' % error) except timeout: abort('Socket timed out.') - html = f.read() + if not f: + abort() + return f.read() + + +def get_remote_file_url(url): + html = get_remote_data(url) # XXX: This is a hack and will be gone, as soon as myapps has an API for this. link = re.findall(b'download file', html) if not link: @@ -68,15 +74,17 @@ parse.urlparse(url).scheme, parse.urlparse(url).netloc, link[0].decode("utf-8")) - f = request.urlopen(download_link) - if not f: - abort() + return download_link + + +def get_remote_file(fn, url, data_dir=DATA_DIR): + data = get_remote_data(url) if os.path.exists(fn): os.remove(fn) if not os.path.exists(os.path.dirname(fn)): os.makedirs(os.path.dirname(fn)) with open(fn, 'bw') as local_file: - local_file.write(f.read()) + local_file.write(data) def read_cr_file(fn, url, local_copy_fn=None): diff -Nru click-reviewers-tools-0.10/clickreviews/apparmor_policy.py click-reviewers-tools-0.10/clickreviews/apparmor_policy.py --- click-reviewers-tools-0.10/clickreviews/apparmor_policy.py 2014-09-10 21:01:45.000000000 +0000 +++ click-reviewers-tools-0.10/clickreviews/apparmor_policy.py 2014-09-23 20:16:17.000000000 +0000 @@ -27,7 +27,8 @@ def get_policy_file(fn): if fn is None: fn = USER_DATA_FILE - clickreviews.remote.get_remote_file(fn, AA_POLICY_DATA_URL) + file_url = clickreviews.remote.get_remote_file_url(AA_POLICY_DATA_URL) + clickreviews.remote.get_remote_file(fn, file_url) class ApparmorPolicy(object): diff -Nru click-reviewers-tools-0.10/clickreviews/cr_security.py click-reviewers-tools-0.10/clickreviews/cr_security.py --- click-reviewers-tools-0.10/clickreviews/cr_security.py 2014-09-10 21:01:45.000000000 +0000 +++ click-reviewers-tools-0.10/clickreviews/cr_security.py 2014-09-23 20:16:17.000000000 +0000 @@ -59,7 +59,8 @@ 'read_path', 'template_variables', 'write_path'] - self.allowed_webapp_policy_groups = ['audio', + self.allowed_webapp_policy_groups = ['accounts', + 'audio', # 'camera', non-functional ATM 'content_exchange', 'location', diff -Nru click-reviewers-tools-0.10/clickreviews/frameworks.py click-reviewers-tools-0.10/clickreviews/frameworks.py --- click-reviewers-tools-0.10/clickreviews/frameworks.py 2014-09-10 21:01:45.000000000 +0000 +++ click-reviewers-tools-0.10/clickreviews/frameworks.py 2014-09-23 20:16:17.000000000 +0000 @@ -17,10 +17,8 @@ import clickreviews.remote USER_DATA_FILE = os.path.join(clickreviews.remote.DATA_DIR, 'frameworks.json') - -# XXX: This is a hack and will be gone, as soon as myapps has an API for this. FRAMEWORKS_DATA_URL = \ - "http://bazaar.launchpad.net/~ubuntu-core-dev/+junk/frameworks/view/head:/frameworks.json" + "https://myapps.developer.ubuntu.com/dev/api/click-framework/" def get_frameworks_file(fn): diff -Nru click-reviewers-tools-0.10/clickreviews/remote.py click-reviewers-tools-0.10/clickreviews/remote.py --- click-reviewers-tools-0.10/clickreviews/remote.py 2014-09-10 21:01:45.000000000 +0000 +++ click-reviewers-tools-0.10/clickreviews/remote.py 2014-09-23 20:16:17.000000000 +0000 @@ -52,14 +52,20 @@ # # Public # -def get_remote_file(fn, url, data_dir=DATA_DIR): +def get_remote_data(url): try: f = request.urlopen(url) except (HTTPError, URLError) as error: abort('Data not retrieved because %s.' % error) except timeout: abort('Socket timed out.') - html = f.read() + if not f: + abort() + return f.read() + + +def get_remote_file_url(url): + html = get_remote_data(url) # XXX: This is a hack and will be gone, as soon as myapps has an API for this. link = re.findall(b'download file', html) if not link: @@ -68,15 +74,17 @@ parse.urlparse(url).scheme, parse.urlparse(url).netloc, link[0].decode("utf-8")) - f = request.urlopen(download_link) - if not f: - abort() + return download_link + + +def get_remote_file(fn, url, data_dir=DATA_DIR): + data = get_remote_data(url) if os.path.exists(fn): os.remove(fn) if not os.path.exists(os.path.dirname(fn)): os.makedirs(os.path.dirname(fn)) with open(fn, 'bw') as local_file: - local_file.write(f.read()) + local_file.write(data) def read_cr_file(fn, url, local_copy_fn=None): diff -Nru click-reviewers-tools-0.10/data/frameworks.json click-reviewers-tools-0.10/data/frameworks.json --- click-reviewers-tools-0.10/data/frameworks.json 2014-09-10 21:02:03.000000000 +0000 +++ click-reviewers-tools-0.10/data/frameworks.json 2014-09-23 20:16:17.000000000 +0000 @@ -1,20 +1,23 @@ { - "ubuntu-sdk-13.10": "deprecated", - "ubuntu-sdk-14.04-dev1": "deprecated", - "ubuntu-sdk-14.04-html-dev1": "deprecated", - "ubuntu-sdk-14.04-papi-dev1": "deprecated", - "ubuntu-sdk-14.04-qml-dev1": "deprecated", - "ubuntu-sdk-14.04": "available", - "ubuntu-sdk-14.04-html": "available", - "ubuntu-sdk-14.04-papi": "available", - "ubuntu-sdk-14.04-qml": "available", - "ubuntu-sdk-14.10-dev1": "obsolete", - "ubuntu-sdk-14.10-html-dev1": "obsolete", - "ubuntu-sdk-14.10-papi-dev1": "obsolete", - "ubuntu-sdk-14.10-qml-dev1": "obsolete", - "ubuntu-sdk-14.10-dev2": "available", - "ubuntu-sdk-14.10-html-dev2": "available", - "ubuntu-sdk-14.10-papi-dev2": "available", - "ubuntu-sdk-14.10-qml-dev2": "available", - "ubuntu-sdk-14.10-qml-dev3": "available" + "ubuntu-sdk-13.10": "deprecated", + "ubuntu-sdk-14.04-html": "available", + "ubuntu-sdk-14.04-qml-dev1": "deprecated", + "ubuntu-sdk-14.10-qml-dev3": "available", + "ubuntu-sdk-14.10-papi-dev3": "available", + "ubuntu-sdk-14.04-html-dev1": "deprecated", + "ubuntu-sdk-14.10-papi-dev1": "obsolete", + "ubuntu-sdk-14.04-papi-dev1": "deprecated", + "ubuntu-sdk-14.10-dev2": "available", + "ubuntu-sdk-14.04": "available", + "ubuntu-sdk-14.10-dev3": "available", + "ubuntu-sdk-14.10-qml-dev1": "obsolete", + "ubuntu-sdk-14.04-dev1": "deprecated", + "ubuntu-sdk-14.10-dev1": "obsolete", + "ubuntu-sdk-14.04-papi": "available", + "ubuntu-sdk-14.04-qml": "available", + "ubuntu-sdk-14.10-papi-dev2": "available", + "ubuntu-sdk-14.10-html-dev3": "available", + "ubuntu-sdk-14.10-html-dev2": "available", + "ubuntu-sdk-14.10-html-dev1": "obsolete", + "ubuntu-sdk-14.10-qml-dev2": "available" } diff -Nru click-reviewers-tools-0.10/debian/bzr-builder.manifest click-reviewers-tools-0.10/debian/bzr-builder.manifest --- click-reviewers-tools-0.10/debian/bzr-builder.manifest 2014-09-10 21:01:46.000000000 +0000 +++ click-reviewers-tools-0.10/debian/bzr-builder.manifest 2014-09-23 20:16:18.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}-0~239 -lp:click-reviewers-tools revid:jamie@ubuntu.com-20140910204945-7s50bj2md73xtl0e +# bzr-builder format 0.3 deb-version {debupstream}-0~241 +lp:click-reviewers-tools revid:jamie@ubuntu.com-20140923173626-x6pehf6x5682wqyx diff -Nru click-reviewers-tools-0.10/debian/changelog click-reviewers-tools-0.10/debian/changelog --- click-reviewers-tools-0.10/debian/changelog 2014-09-10 21:01:46.000000000 +0000 +++ click-reviewers-tools-0.10/debian/changelog 2014-09-23 20:16:18.000000000 +0000 @@ -1,8 +1,8 @@ -click-reviewers-tools (0.10-0~239~ubuntu14.04.1) trusty; urgency=low +click-reviewers-tools (0.10-0~241~ubuntu14.04.1) trusty; urgency=low * Auto build. - -- Daniel Holbach Wed, 10 Sep 2014 21:01:46 +0000 + -- Daniel Holbach Tue, 23 Sep 2014 20:16:18 +0000 click-reviewers-tools (0.10) UNRELEASED; urgency=medium