[gentoo-commits] gentoo-x86 commit in app-portage/layman/files: layman-2.2.0-change-for-upstream-ssl-fetch.patch layman-2.2.0-adds-kwargs-debug.patch

[gentoo-commits] gentoo-x86 commit in app-portage/layman/files: layman-2.2.0-change-for-upstream-ssl-fetch.patch layman-2.2.0-adds-kwargs-debug.patch

[Devan Franchini (twitch153)]

twitch153    15/01/12 19:35:22

  Modified:             layman-2.2.0-adds-kwargs-debug.patch
  Added:                layman-2.2.0-change-for-upstream-ssl-fetch.patch
  Log:
  Adds patch to bring layman-2.2.0 up to date for ssl-fetch, bug #536280
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A8C8FBCF)

Revision  Changes    Path
1.2                  app-portage/layman/files/layman-2.2.0-adds-kwargs-debug.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/layman/files/layman-2.2.0-adds-kwargs-debug.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/layman/files/layman-2.2.0-adds-kwargs-debug.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/layman/files/layman-2.2.0-adds-kwargs-debug.patch?r1=1.1&r2=1.2

Index: layman-2.2.0-adds-kwargs-debug.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-portage/layman/files/layman-2.2.0-adds-kwargs-debug.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- layman-2.2.0-adds-kwargs-debug.patch	12 Jan 2015 01:13:30 -0000	1.1
+++ layman-2.2.0-adds-kwargs-debug.patch	12 Jan 2015 19:35:22 -0000	1.2
@@ -16,12 +16,13 @@
             
 --- a/layman/remotedb.py
 +++ b/layman/remotedb.py
-@@ -120,6 +120,7 @@ class RemoteDB(DbBase):
+@@ -120,6 +120,6 @@ class RemoteDB(DbBase):
              'info':  self.output.info,
+             'debug': self.output.debug,
              'error': self.output.error,
 -            'kwargs-info': {'level': 2},
 +            'kwargs-info': {'level': 5},
-+            'kwargs-debug': {'level': 2},
+             'kwargs-debug': {'level': 2},
              'kwargs-error':{'level': None},
          }
 



1.1                  app-portage/layman/files/layman-2.2.0-change-for-upstream-ssl-fetch.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/layman/files/layman-2.2.0-change-for-upstream-ssl-fetch.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/layman/files/layman-2.2.0-change-for-upstream-ssl-fetch.patch?rev=1.1&content-type=text/plain

Index: layman-2.2.0-change-for-upstream-ssl-fetch.patch
===================================================================
From 81f1545f1371931d560492e8b323096d4befc775 Mon Sep 17 00:00:00 2001
From: Brian Dolbec <dolsen@gentoo.org>
Date: Fri, 17 Oct 2014 19:40:38 -0700
Subject: [PATCH] remotedb.py: Change for upstream ssl-fetch change

---
 layman/remotedb.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/layman/remotedb.py b/layman/remotedb.py
index f0f7ea9..b866bd7 100644
--- a/layman/remotedb.py
+++ b/layman/remotedb.py
@@ -57,7 +57,7 @@ class RemoteDB(DbBase):
         self.detached_urls = []
         self.signed_urls = []
         self.proxies = config.proxies
-        
+
         self.urls  = [i.strip()
             for i in config['overlays'].split('\n') if len(i)]
 
@@ -116,9 +116,11 @@ class RemoteDB(DbBase):
         need_gpg = [False, True, True]
         # setup the ssl-fetch output map
         connector_output = {
-            'info':  self.output.debug,
+            'info':  self.output.info,
+            'debug': self.output.debug,
             'error': self.output.error,
             'kwargs-info': {'level': 2},
+            'kwargs-debug': {'level': 2},
             'kwargs-error':{'level': None},
         }
         fetcher = Connector(connector_output, self.proxies, USERAGENT)
-- 
2.0.5