Rev bump to add patch for local overlay listings

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A8C8FBCF)

3 files changed, 37 insertions, 2 deletions

diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog
index 0cef13403726..eeabe72a4128 100644
--- a/app-portage/layman/ChangeLog
+++ b/app-portage/layman/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/layman
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.199 2014/07/24 19:01:48 twitch153 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.200 2014/07/27 03:17:20 twitch153 Exp $
+
+*layman-2.1.0-r1 (27 Jul 2014)
+
+  27 Jul 2014; Devan Franchini <twitch153@gentoo.org>
+  +files/layman-2.1.0-local_overlay.patch, +layman-2.1.0-r1.ebuild,
+  -layman-2.1.0.ebuild:
+  Rev bump to add patch for local overlay listings
 
 *layman-2.1.0 (24 Jul 2014)
 
diff --git a/app-portage/layman/files/layman-2.1.0-local_overlay.patch b/app-portage/layman/files/layman-2.1.0-local_overlay.patch
new file mode 100644
index 000000000000..fbe5cd0e8137
--- /dev/null
+++ b/app-portage/layman/files/layman-2.1.0-local_overlay.patch
@@ -0,0 +1,27 @@
+From d0e5d9120c27f678e9039bb2f65cfc0e457be6c7 Mon Sep 17 00:00:00 2001
+From: Douglas Freed <dwfreed@mtu.edu>
+Date: Sat, 26 Jul 2014 15:54:11 -0700
+Subject: [PATCH] Fix a bug when an overlay isn't in the remote list
+
+If the overlay isn't in the remote list, it obviously isn't a different
+type, nor has its URL changed, so just init those to False so we can
+sync the overlay without hitting UnboundLocalError.
+---
+ layman/api.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/layman/api.py b/layman/api.py
+index a86970f..930f449 100755
+--- a/layman/api.py
++++ b/layman/api.py
+@@ -426,6 +426,7 @@ class LaymanAPI(object):
+                 message = 'Overlay "%s" could not be found in the remote lists.\n' \
+                         'Please check if it has been renamed and re-add if necessary.' % ovl
+                 warnings.append((ovl, message))
++                (diff_type, update_url) = (False, False)
+             else:
+                 self.output.debug("API.sync(); else: self._get_remote_db().select(ovl)", 5)
+ 
+-- 
+1.8.5.5
+
diff --git a/app-portage/layman/layman-2.1.0.ebuild b/app-portage/layman/layman-2.1.0-r1.ebuild
index 5754978535c6..1cd42a19b9c0 100644
--- a/app-portage/layman/layman-2.1.0.ebuild
+++ b/app-portage/layman/layman-2.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-2.1.0.ebuild,v 1.1 2014/07/24 19:01:48 twitch153 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-2.1.0-r1.ebuild,v 1.1 2014/07/27 03:17:20 twitch153 Exp $
 
 EAPI="5"
 
@@ -40,6 +40,7 @@ RDEPEND="
 
 python_prepare_all()  {
 	distutils-r1_python_prepare_all
+	epatch "${FILESDIR}"/${P}-local_overlay.patch
 	eprefixify etc/layman.cfg layman/config.py
 }