app-portage/layman: Integrate patch to bug #301253 for 1.3.0_rc1-r2

(Portage version: 2.2_rc61/cvs/Linux i686)

1 files changed, 61 insertions, 0 deletions

diff --git a/app-portage/layman/files/layman-1.3.0_rc1-refactoring-fix.patch b/app-portage/layman/files/layman-1.3.0_rc1-refactoring-fix.patch
new file mode 100644
index 000000000000..efa6cc905dea
--- /dev/null
+++ b/app-portage/layman/files/layman-1.3.0_rc1-refactoring-fix.patch
@@ -0,0 +1,61 @@
+From 35b801214aabd8d4a06bcd501a21601827ea2256 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 17 Jan 2010 17:02:02 +0100
+Subject: [PATCH] Fix refactoring faults
+
+---
+ CHANGES                      |    2 ++
+ layman/overlays/mercurial.py |    4 ++--
+ layman/overlays/overlay.py   |    2 --
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/CHANGES b/CHANGES
+index 5ef7dd0..1a9473c 100644
+--- a/CHANGES
++++ b/CHANGES
+@@ -7,6 +7,8 @@ Version TODO
+  - Syncing failed for overlays that no longer exist in the remote
+    lists with no need to (bug #301174)
+ 
++ - Fix faults introduced at refactoring (bug #301253)
++
+ 
+ Version 1.3.0_rc1 - Released 2010/01/15
+ =======================================
+diff --git a/layman/overlays/mercurial.py b/layman/overlays/mercurial.py
+index add5136..2bda112 100644
+--- a/layman/overlays/mercurial.py
++++ b/layman/overlays/mercurial.py
+@@ -50,14 +50,14 @@ class MercurialOverlay(OverlaySource):
+         self.supported()
+ 
+         return self.cmd(self.command() + ' clone "' + self.src + '/" "' +
+-                        path([base, self.name]) + '"')
++                        path([base, self.parent.name]) + '"')
+ 
+     def sync(self, base, quiet = False):
+         '''Sync overlay.'''
+ 
+         self.supported()
+ 
+-        return self.cmd('cd "' + path([base, self.name]) + '" && ' +
++        return self.cmd('cd "' + path([base, self.parent.name]) + '" && ' +
+                         self.command() + ' pull -u "' + self.src + '"')
+ 
+     def supported(self):
+diff --git a/layman/overlays/overlay.py b/layman/overlays/overlay.py
+index 30d0966..f4ec63d 100644
+--- a/layman/overlays/overlay.py
++++ b/layman/overlays/overlay.py
+@@ -99,8 +99,6 @@ class Overlay(object):
+         >>> b.is_official()
+         False
+         '''
+-        self.config = config
+-        self.quiet = quiet
+ 
+         _name = xml.find('name')
+         if _name != None:
+-- 
+1.6.6
+