From: "Brian Dolbec" <brian.dolbec@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/layman:master commit in: layman/
Date: Mon, 10 Mar 2014 03:18:16 +0000 (UTC) [thread overview]
Message-ID: <1394421473.898fcf8d2a0a8c207984b708642e0bae217a5317.dol-sen@gentoo> (raw)
commit: 898fcf8d2a0a8c207984b708642e0bae217a5317
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 10 03:13:49 2014 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Mar 10 03:17:53 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=898fcf8d
remotedb.py: Fix a couple debug noise level settings,
Fix some long lines, parameter spacing.
---
layman/remotedb.py | 53 ++++++++++++++++++++++++++++++++---------------------
1 file changed, 32 insertions(+), 21 deletions(-)
diff --git a/layman/remotedb.py b/layman/remotedb.py
index fbd4200..98dffbb 100644
--- a/layman/remotedb.py
+++ b/layman/remotedb.py
@@ -95,7 +95,8 @@ class RemoteDB(DbBase):
if GPG_ENABLED:
self.get_gpg_urls()
else:
- self.output.debug('RemoteDB.__init__(), NOT GPG_ENABLED, bypassing...', 2)
+ self.output.debug('RemoteDB.__init__(), NOT GPG_ENABLED, '
+ 'bypassing...', 2)
# add up the lists to load for display, etc.
# unsigned overlay lists
@@ -105,9 +106,13 @@ class RemoteDB(DbBase):
# single file signed, compressed, clearsigned
paths.extend([self.filepath(i) + '.xml' for i in self.signed_urls])
- self.output.debug('RemoteDB.__init__(), url lists= \nself.urls: %s\nself.detached_urls: %s\nself.signed_urls: %s' % (str(self.urls), str(self.detached_urls), str(self.signed_urls)), 2)
+ self.output.debug('RemoteDB.__init__(), url lists= \nself.urls: '
+ '%s\nself.detached_urls: %s\nself.signed_urls: %s'
+ % (str(self.urls), str(self.detached_urls), str(self.signed_urls)),
+ 2)
- self.output.debug('RemoteDB.__init__(), paths to load = %s' %str(paths), 2)
+ self.output.debug('RemoteDB.__init__(), paths to load = %s' %str(paths),
+ 2)
if config['nocheck']:
ignore = 2
@@ -167,7 +172,7 @@ class RemoteDB(DbBase):
url_lists = [self.urls, self.detached_urls, self.signed_urls]
need_gpg = [False, True, True]
for index in range(0, 3):
- self.output.debug("RemoteDB.cache() index = %s" %str(index),2)
+ self.output.debug("RemoteDB.cache() index = %s" %str(index), 2)
urls = url_lists[index]
if need_gpg[index] and len(urls) and self.gpg is None:
#initialize our gpg instance
@@ -176,7 +181,7 @@ class RemoteDB(DbBase):
for url in urls:
sig = ''
self.output.debug("RemoteDB.cache() url = %s is a tuple=%s"
- %(str(url), str(isinstance(url, tuple))),2)
+ %(str(url), str(isinstance(url, tuple))), 2)
filepath, mpath, tpath, sig = self._paths(url)
if 'file://' in url:
success, olist, timestamp = self._fetch_file(
@@ -191,15 +196,17 @@ class RemoteDB(DbBase):
#succeeded = False
continue
- self.output.debug("RemoteDB.cache() len(olist) = %s" %str(len(olist)),2)
+ self.output.debug("RemoteDB.cache() len(olist) = %s"
+ % str(len(olist)), 2)
# GPG handling
if need_gpg[index]:
olist, verified = self.verify_gpg(url, sig, olist)
if not verified:
self.output.debug("RemoteDB.cache() gpg returned "
- "verified = %s" %str(verified),2)
+ "verified = %s" %str(verified), 2)
succeeded = False
- filename = os.path.join(self.config['storage'], "Failed-to-verify-sig")
+ filename = os.path.join(self.config['storage'],
+ "Failed-to-verify-sig")
self.write_cache(olist, filename)
continue
@@ -214,13 +221,13 @@ class RemoteDB(DbBase):
has_updates = max(has_updates,
self.write_cache(olist, mpath, tpath, timestamp))
- self.output.debug("RemoteDB.cache() self.urls: has_updates, succeeded"
- " %s, %s" % (str(has_updates), str(succeeded)), 4)
+ self.output.debug("RemoteDB.cache() self.urls: has_updates, "
+ "succeeded %s, %s" % (str(has_updates), str(succeeded)), 4)
return has_updates, succeeded
def _paths(self, url):
- self.output.debug("RemoteDB._paths(), url is tuple %s" % str(url),2)
+ self.output.debug("RemoteDB._paths(), url is tuple %s" % str(url), 2)
if isinstance(url, tuple):
filepath = self.filepath(url[0])
sig = filepath + '.sig'
@@ -292,8 +299,10 @@ class RemoteDB(DbBase):
quieter = 1
self.output.info('Fetching new list... %s' % url, 4 + quieter)
if url_timestamp is not None:
- self.output.info('Last-modified: %s' % url_timestamp, 4 + quieter)
- self.output.debug('RemoteDB._fetch_url(), olist type = %s' %str(type(olist)),2)
+ self.output.info('Last-modified: %s' % url_timestamp,
+ 4 + quieter)
+ self.output.debug('RemoteDB._fetch_url(), olist type = %s'
+ % str(type(olist)),2)
return (True, olist, url_timestamp)
@@ -314,7 +323,8 @@ class RemoteDB(DbBase):
if not self.check_path([mpath]):
return (False, '', '')
- self.output.debug('RemoteDB._fetch_url(); headers = %s' %str(headers))
+ self.output.debug('RemoteDB._fetch_url(); headers = %s'
+ % str(headers), 2)
self.output.debug('RemoteDB._fetch_url(); connecting to opener', 2)
try:
connection = requests.get(
@@ -334,7 +344,7 @@ class RemoteDB(DbBase):
# py2, py3 compatibility, since only py2 returns keys as lower()
headers = dict((x.lower(), x) for x in list(connection.headers))
self.output.info('HEADERS = %s' %str(connection.headers), 4)
- self.output.debug('Status_code = %i' % connection.status_code)
+ self.output.debug('Status_code = %i' % connection.status_code, 2)
if connection.status_code in [304]:
self.output.info('Remote list already up to date: %s'
% url, 4)
@@ -379,8 +389,9 @@ class RemoteDB(DbBase):
try:
self.read(olist, origin=url)
except Exception, error:
- self.output.debug("RemoteDB._check_download(), url=%s \nolist:\n" % url,2)
- self.output.debug(olist,2)
+ self.output.debug("RemoteDB._check_download(), url=%s \nolist:\n"
+ % url,2)
+ self.output.debug(olist, 2)
raise IOError('Failed to parse the overlays list fetched fr'
'om ' + url + '\nThis means that the download'
'ed file is somehow corrupt or there was a pr'
@@ -434,7 +445,7 @@ class RemoteDB(DbBase):
olist = gpg_result.output
# verify and report
self.output.debug("gpg_result, verified=%s, len(olist)=%s"
- % (gpg_result.verified[0], str(len(olist))),1)
+ % (gpg_result.verified[0], str(len(olist))), 1)
if gpg_result.verified[0]:
self.output.info("GPG verification succeeded for gpg-signed url.", 4)
self.output.info('\tSignature result:' + str(gpg_result.verified), 4)
@@ -446,7 +457,7 @@ class RemoteDB(DbBase):
def dl_sig(self, url, sig):
- self.output.debug("RemoteDB.dl_sig() url=%s, sig=%s" % (url, sig),2)
+ self.output.debug("RemoteDB.dl_sig() url=%s, sig=%s" % (url, sig), 2)
success, newsig, timestamp = self._fetch_url(url, sig)
if success:
success = self.write_cache(newsig, sig)
@@ -454,13 +465,13 @@ class RemoteDB(DbBase):
def init_gpg(self):
- self.output.debug("RemoteDB.init_gpg(), initializing",2)
+ self.output.debug("RemoteDB.init_gpg(), initializing", 2)
if not self.gpg_config:
self.gpg_config = GPGConfig()
if not self.gpg:
self.gpg = GPG(self.gpg_config)
- self.output.debug("RemoteDB.init_gpg(), initialized :D",2)
+ self.output.debug("RemoteDB.init_gpg(), initialized :D", 2)
def get_gpg_urls(self):
'''Extend paths with gpg signed url listings from the config
next reply other threads:[~2014-03-10 3:18 UTC|newest]
Thread overview: 246+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-10 3:18 Brian Dolbec [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-04-24 20:59 [gentoo-commits] proj/layman:master commit in: layman/ Brian Dolbec
2020-04-24 20:59 Brian Dolbec
2017-03-22 6:36 Brian Dolbec
2017-02-02 17:12 Brian Dolbec
2017-02-02 1:12 Devan Franchini
2017-02-02 1:12 Devan Franchini
2016-11-10 2:59 Devan Franchini
2016-05-10 22:13 Brian Dolbec
2016-05-02 3:30 Devan Franchini
2016-03-10 0:00 Devan Franchini
2016-03-09 23:37 Devan Franchini
2016-02-29 6:21 Devan Franchini
2016-01-29 10:21 Brian Dolbec
2015-12-31 1:03 Devan Franchini
2015-12-26 23:24 Brian Dolbec
2015-11-29 3:26 Devan Franchini
2015-11-29 3:12 Devan Franchini
2015-10-17 3:20 Devan Franchini
2015-10-16 18:49 Devan Franchini
2015-10-16 18:49 Devan Franchini
2015-09-23 15:25 Devan Franchini
2015-09-05 6:03 Devan Franchini
2015-08-28 1:48 Devan Franchini
2015-08-28 1:48 Devan Franchini
2015-08-28 1:48 Devan Franchini
2015-08-04 1:05 Devan Franchini
2015-07-19 3:53 Devan Franchini
2015-07-17 17:05 Devan Franchini
2015-07-17 17:05 Devan Franchini
2015-07-17 17:05 Devan Franchini
2015-07-15 16:15 Devan Franchini
2015-07-15 15:53 Devan Franchini
2015-07-13 23:05 Devan Franchini
2015-07-13 13:26 Devan Franchini
2015-07-09 17:23 Devan Franchini
2015-07-09 16:18 Devan Franchini
2015-06-16 3:45 Devan Franchini
2015-06-14 4:12 Devan Franchini
2015-06-13 4:53 Devan Franchini
2015-06-13 2:38 Devan Franchini
2015-06-13 2:31 Devan Franchini
2015-05-13 21:32 Devan Franchini
2015-05-13 21:27 Devan Franchini
2015-05-13 20:38 Devan Franchini
2015-05-13 20:05 Devan Franchini
2015-05-13 19:58 Devan Franchini
2015-04-22 17:40 Devan Franchini
2015-04-20 17:15 Devan Franchini
2015-03-27 23:42 Devan Franchini
2015-03-26 22:50 Devan Franchini
2015-03-26 22:06 Devan Franchini
2015-03-24 23:08 Devan Franchini
2015-03-24 22:56 Devan Franchini
2015-03-24 22:20 Devan Franchini
2015-03-24 16:08 Devan Franchini
2015-03-07 22:40 Devan Franchini
2015-03-07 22:40 Devan Franchini
2015-03-07 22:10 Devan Franchini
2015-03-07 22:02 Devan Franchini
2015-02-21 18:41 Devan Franchini
2015-02-17 5:07 Brian Dolbec
2015-02-09 18:25 Devan Franchini
2015-02-08 4:20 Brian Dolbec
2015-02-08 4:20 Brian Dolbec
2015-02-08 2:58 Devan Franchini
2015-02-08 1:57 Brian Dolbec
2015-02-08 0:33 Devan Franchini
2015-02-05 2:56 Devan Franchini
2015-02-05 2:31 Devan Franchini
2015-02-05 2:20 Devan Franchini
2015-02-03 2:43 Devan Franchini
2014-12-08 4:15 Devan Franchini
2014-12-04 20:46 Devan Franchini
2014-11-13 19:03 Brian Dolbec
2014-11-13 18:43 Brian Dolbec
2014-11-13 18:43 Brian Dolbec
2014-11-13 18:08 Brian Dolbec
2014-11-13 18:08 Brian Dolbec
2014-11-13 18:08 Brian Dolbec
2014-11-13 18:08 Brian Dolbec
2014-11-02 21:14 Devan Franchini
2014-09-28 22:42 Devan Franchini
2014-09-20 17:47 Devan Franchini
2014-09-19 18:13 Devan Franchini
2014-09-19 18:13 Devan Franchini
2014-08-28 22:54 Brian Dolbec
2014-08-28 22:01 Devan Franchini
2014-08-28 22:01 Devan Franchini
2014-08-19 1:49 Devan Franchini
2014-08-19 1:49 Devan Franchini
2014-08-17 4:01 ` Devan Franchini
2014-08-19 1:49 Devan Franchini
2014-08-15 23:16 ` Devan Franchini
2014-08-19 1:49 Devan Franchini
2014-08-15 23:27 ` Devan Franchini
2014-08-19 1:49 Devan Franchini
2014-08-19 1:49 Devan Franchini
2014-08-15 22:33 ` Devan Franchini
2014-08-19 1:49 Devan Franchini
2014-08-16 22:46 ` Devan Franchini
2014-08-17 20:55 Devan Franchini
2014-08-19 1:49 ` Devan Franchini
2014-08-17 14:15 Brian Dolbec
2014-08-16 18:06 Brian Dolbec
2014-08-15 23:59 Devan Franchini
2014-08-19 1:49 ` Devan Franchini
2014-06-16 3:40 Brian Dolbec
2014-06-16 3:40 Brian Dolbec
2014-06-16 3:40 Brian Dolbec
2014-06-16 3:37 [gentoo-commits] proj/layman:gsoc2014 " Brian Dolbec
2014-06-16 3:40 ` [gentoo-commits] proj/layman:master " Brian Dolbec
2014-06-16 3:37 [gentoo-commits] proj/layman:gsoc2014 " Brian Dolbec
2014-06-16 3:40 ` [gentoo-commits] proj/layman:master " Brian Dolbec
2014-06-16 3:37 [gentoo-commits] proj/layman:gsoc2014 " Brian Dolbec
2014-06-16 3:40 ` [gentoo-commits] proj/layman:master " Brian Dolbec
2014-06-16 3:37 [gentoo-commits] proj/layman:gsoc2014 " Brian Dolbec
2014-06-16 3:40 ` [gentoo-commits] proj/layman:master " Brian Dolbec
2014-05-07 22:18 Devan Franchini
2013-12-29 2:30 Brian Dolbec
2013-08-18 14:48 Brian Dolbec
2013-07-29 1:46 Brian Dolbec
2013-01-11 18:29 Brian Dolbec
2012-12-16 18:13 Brian Dolbec
2012-11-28 4:14 Brian Dolbec
2012-11-28 4:02 Brian Dolbec
2012-11-28 4:02 Brian Dolbec
2012-11-18 22:15 Brian Dolbec
2012-11-18 22:15 Brian Dolbec
2012-11-18 22:15 Brian Dolbec
2012-11-01 4:00 Brian Dolbec
2012-10-30 8:30 Brian Dolbec
2012-10-17 6:21 Brian Dolbec
2012-10-17 6:21 Brian Dolbec
2012-10-13 22:20 Brian Dolbec
2012-10-13 22:20 Brian Dolbec
2012-10-08 5:37 Brian Dolbec
2012-10-07 23:40 Brian Dolbec
2012-10-07 23:40 Brian Dolbec
2012-06-07 4:49 Brian Dolbec
2012-06-07 4:49 Brian Dolbec
2012-06-07 4:49 Brian Dolbec
2012-04-14 2:14 Brian Dolbec
2012-04-09 19:47 Brian Dolbec
2012-04-01 21:54 Brian Dolbec
2012-03-26 3:43 Brian Dolbec
2012-03-04 15:36 Brian Dolbec
2011-12-27 2:20 Brian Dolbec
2011-10-27 4:42 Brian Dolbec
2011-10-26 23:19 Brian Dolbec
2011-10-14 3:14 Brian Dolbec
2011-09-24 6:07 Brian Dolbec
2011-08-25 3:33 Brian Dolbec
2011-08-21 7:53 Brian Dolbec
2011-08-21 7:53 Brian Dolbec
2011-08-21 7:53 Brian Dolbec
2011-08-20 17:06 Brian Dolbec
2011-08-20 17:06 Brian Dolbec
2011-08-11 3:24 Brian Dolbec
2011-08-11 3:24 Brian Dolbec
2011-08-11 3:24 Brian Dolbec
2011-08-11 3:24 Brian Dolbec
2011-08-09 2:46 Brian Dolbec
2011-08-07 21:21 Brian Dolbec
2011-08-07 7:12 Brian Dolbec
2011-08-07 7:12 Brian Dolbec
2011-08-07 7:12 Brian Dolbec
2011-08-07 6:00 Brian Dolbec
2011-08-07 2:29 Brian Dolbec
2011-08-06 20:30 Brian Dolbec
2011-08-06 18:29 Brian Dolbec
2011-08-06 18:29 Brian Dolbec
2011-07-28 21:33 Brian Dolbec
2011-07-23 6:45 Brian Dolbec
2011-07-20 18:34 Brian Dolbec
2011-07-12 20:01 Brian Dolbec
2011-07-12 19:57 Brian Dolbec
2011-07-12 19:57 Brian Dolbec
2011-07-12 19:02 Brian Dolbec
2011-07-12 19:02 Brian Dolbec
2011-05-18 5:19 Brian Dolbec
2011-05-18 5:13 Brian Dolbec
2011-05-14 13:06 Brian Dolbec
2011-05-05 9:44 Brian Dolbec
2011-05-02 5:25 Brian Dolbec
2011-05-01 2:18 Brian Dolbec
2011-05-01 0:53 Brian Dolbec
2011-05-01 0:26 Brian Dolbec
2011-04-30 22:37 Brian Dolbec
2011-04-30 22:37 Brian Dolbec
2011-04-30 6:37 Brian Dolbec
2011-04-30 6:37 Brian Dolbec
2011-04-27 10:58 Brian Dolbec
2011-04-27 10:58 Brian Dolbec
2011-04-27 10:58 Brian Dolbec
2011-04-27 10:58 Brian Dolbec
2011-04-27 10:58 Brian Dolbec
2011-04-27 10:58 Brian Dolbec
2011-04-27 10:58 Brian Dolbec
2011-04-27 10:58 Brian Dolbec
2011-04-27 10:58 Brian Dolbec
2011-04-27 10:58 Brian Dolbec
2011-04-27 10:58 Brian Dolbec
2011-04-27 10:58 Brian Dolbec
2011-04-27 10:58 Brian Dolbec
2011-04-27 10:58 Brian Dolbec
2011-04-27 10:58 Brian Dolbec
2011-02-19 11:01 Brian Dolbec
2011-02-19 11:01 Brian Dolbec
2011-02-19 11:01 Brian Dolbec
2011-02-19 11:01 Brian Dolbec
2011-02-19 4:49 Brian Dolbec
2011-02-19 4:47 Brian Dolbec
2011-02-19 4:10 Brian Dolbec
2011-02-19 4:07 Brian Dolbec
2011-02-17 21:53 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 6:00 Brian Dolbec
2011-02-14 0:54 [gentoo-commits] proj/layman:overlord_merge " Brian Dolbec
2011-02-14 6:00 ` [gentoo-commits] proj/layman:master " Brian Dolbec
2011-02-14 0:54 [gentoo-commits] proj/layman:overlord_merge " Brian Dolbec
2011-02-14 6:00 ` [gentoo-commits] proj/layman:master " Brian Dolbec
2011-02-14 0:54 [gentoo-commits] proj/layman:overlord_merge " Brian Dolbec
2011-02-14 6:00 ` [gentoo-commits] proj/layman:master " Brian Dolbec
2011-02-14 0:54 [gentoo-commits] proj/layman:overlord_merge " Brian Dolbec
2011-02-14 6:00 ` [gentoo-commits] proj/layman:master " Brian Dolbec
2011-02-14 0:54 [gentoo-commits] proj/layman:overlord_merge " Brian Dolbec
2011-02-14 6:00 ` [gentoo-commits] proj/layman:master " Brian Dolbec
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1394421473.898fcf8d2a0a8c207984b708642e0bae217a5317.dol-sen@gentoo \
--to=brian.dolbec@gmail.com \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox