commit: 07dcf53ca7717085af91bc391b08074a2cd88a8f
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Thu May 15 20:25:37 2014 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Thu May 15 20:25:37 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=07dcf53c
output.py: Migrates output mappings.
remotedb.py, tar.py: Removes output mappings necessary for ssl-fetch
usage in favor of mapping them in output.py to avoid mapping the
functions in more than one place.
---
layman/output.py | 11 +++++++++++
layman/overlays/tar.py | 4 ++--
layman/remotedb.py | 4 ++--
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/layman/output.py b/layman/output.py
index ef348f5..0c19ab9 100644
--- a/layman/output.py
+++ b/layman/output.py
@@ -124,6 +124,11 @@ class Message(MessageBase):
MessageBase.__init__(self, out, err, info_level, warn_level,
note_level, col, error_callback)
+
+ # Maps output functions for compatibility with ssl-fetch
+ # output calls.
+ self.output.write = self.output.info
+ self.output.print_err = self.output.error
## Output Functions
@@ -161,6 +166,9 @@ class Message(MessageBase):
for i in info.split('\n'):
print(" %s %s" % (self.color_func('green', '*'),i),
file=self.std_out)
+ # Maps info function to write function
+ # for ssl-fetch usage.
+ write = info
def status (self, message, status, info = 'ignored'):
@@ -218,6 +226,9 @@ class Message(MessageBase):
self.std_out.flush()
self.do_error_callback(error)
+ # Maps error function with print_err function
+ # for ssl-fetch usage.
+ print_err = error
def die (self, error):
diff --git a/layman/overlays/tar.py b/layman/overlays/tar.py
index 94fefb1..8574f1a 100644
--- a/layman/overlays/tar.py
+++ b/layman/overlays/tar.py
@@ -126,8 +126,8 @@ class TarOverlay(OverlaySource):
# Maps output functions for compatibility with ssl-fetch
# output calls.
- self.output.write = self.output.info
- self.output.print_err = self.output.error
+ #self.output.write = self.output.info
+ #self.output.print_err = self.output.error
success, tar, timestamp = fetcher.fetch_content(tar_url)
diff --git a/layman/remotedb.py b/layman/remotedb.py
index 24ee8b8..959b090 100644
--- a/layman/remotedb.py
+++ b/layman/remotedb.py
@@ -150,8 +150,8 @@ class RemoteDB(DbBase):
fetcher = Connector(self.output, self.proxies, USERAGENT)
# Maps output functions for compatibility with ssl-fetch
# output calls.
- self.output.write = self.output.info
- self.output.print_err = self.output.error
+ #self.output.write = self.output.info
+ #self.output.print_err = self.output.error
for index in range(0, 3):
self.output.debug("RemoteDB.cache() index = %s" %str(index), 2)
