fix mistracking success bug, bump ebuild with the patch

3 files changed, 74 insertions, 1 deletions

diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index 76e5c55..44976b6 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -1,4 +1,5 @@
+AUX layman-2.0.0_rc1-fix-mistracking-success.patch 2698 RMD160 90003540b90f66de32e62ab3b8c82ed226643369 SHA1 ba08b23a7f51978b33ba02acff97cf8c0c86b78d SHA256 723dcd1c8574e9c1cfbb098c4b866f41d7e42833202202adfd9e6bee3efda156
 DIST layman-2.0.0_rc1.tar.gz 70796 RMD160 d2d377b4930c8c630939bf929bdc609744d9689e SHA1 4fa9ade163d0c2b1c4f7fda3223da4f6c46d067c SHA256 20587f6410d544a70616f24705ea5dbdacc17e929109e307083d14d272dcbb02
-EBUILD layman-2.0.0_rc1.ebuild 2429 RMD160 53722a7bb0bf0d87356464cd322b8820c1dd7c71 SHA1 205f31a8902946c5e0acf10b8312134f2d2b5c33 SHA256 8483fed94ed879f329b587944a9921e584c0d8196523a2fa0937e0f53f547ebd
+EBUILD layman-2.0.0_rc1-r1.ebuild 2504 RMD160 c61902e90dc529f3000c9f0cc798ca0e79c869bf SHA1 9a9acb7777fe0302dfaf81a8ec82fa75e45769cf SHA256 ed50b37d03ac639e06844f124bbf7c81a8aa13a43ea040aee91698010ad5030b
 MISC ChangeLog 20549 RMD160 53cd6f7501b3d9f0dc8869d1e3b1e61d08b58162 SHA1 cea56acdc983471be1c47d767dc8d15648969998 SHA256 e94ced3ecc339cd9a0b82d161234d4a5a9777bf16d70c69d835bbe748eb00cde
 MISC metadata.xml 912 RMD160 8d63f4e9672a7b15587026626802074a7b0e968b SHA1 00ffdacd3dcbd4e0652517628e9c932f32865a4a SHA256 67a4974996e495ff3f49e3874d9e1d6f4fe251e9e49d92385ef14d4f23550b10
diff --git a/app-portage/layman/files/layman-2.0.0_rc1-fix-mistracking-success.patch b/app-portage/layman/files/layman-2.0.0_rc1-fix-mistracking-success.patch
new file mode 100644
index 0000000..7645b56
--- /dev/null
+++ b/app-portage/layman/files/layman-2.0.0_rc1-fix-mistracking-success.patch
@@ -0,0 +1,69 @@
+From c5c3121331d8f2f2b39b8f41b91d705d197be250 Mon Sep 17 00:00:00 2001
+From: dol-sen <brian.dolbec@gmail.com>
+Date: Tue, 12 Jul 2011 12:01:43 -0700
+Subject: [PATCH] fix mistracking success adding an overlay.
+
+---
+ layman/api.py |   17 +++++++++--------
+ layman/db.py  |    4 +++-
+ 2 files changed, 12 insertions(+), 9 deletions(-)
+
+diff --git a/layman/api.py b/layman/api.py
+index 8e54d7d..a924ead 100644
+--- a/layman/api.py
++++ b/layman/api.py
+@@ -114,14 +114,14 @@ class LaymanAPI(object):
+                 self._error("Repository '"+ovl+"' was not installed")
+                 results.append(False)
+                 continue
++            success = False
+             try:
+-                self._get_installed_db().delete(
++                success = self._get_installed_db().delete(
+                     self._get_installed_db().select(ovl))
+-                results.append(True)
+             except Exception as e:
+                 self._error(
+-                        "Failed to disable repository '"+ovl+"':\n"+str(e))
+-                results.append(False)
++                        "Exception caught disabling repository '"+ovl+"':\n"+str(e))
++            results.append(success)
+             self.get_installed(dbreload=True)
+         if False in results:
+             return False
+@@ -147,12 +147,13 @@ class LaymanAPI(object):
+                 self._error(UnknownOverlayMessage(ovl))
+                 results.append(False)
+                 continue
++            success = False
+             try:
+-                self._get_installed_db().add(self._get_remote_db().select(ovl), quiet=True)
+-                results.append(True)
++                success = self._get_installed_db().add(
++                    self._get_remote_db().select(ovl), quiet=True)
+             except Exception as e:
+-                self._error("Failed to enable repository '"+ovl+"' : "+str(e))
+-                results.append(False)
++                self._error("Exception caught enabling repository '"+ovl+"' : "+str(e))
++            results.append(success)
+             self.get_installed(dbreload=True)
+         if False in results:
+             return False
+diff --git a/layman/db.py b/layman/db.py
+index 3ed5cc6..b1df906 100644
+--- a/layman/db.py
++++ b/layman/db.py
+@@ -206,7 +206,9 @@ class DB(DbBase):
+             self.write(self.path)
+             make_conf.delete(overlay)
+         else:
+-            raise Exception('No local overlay named "' + overlay.name + '"!')
++            self.output.error('No local overlay named "' + overlay.name + '"!')
++            return False
++        return True
+ 
+     def sync(self, overlay_name, quiet = False):
+         '''Synchronize the given overlay.'''
+-- 
+1.7.6
+
diff --git a/app-portage/layman/layman-2.0.0_rc1.ebuild b/app-portage/layman/layman-2.0.0_rc1-r1.ebuild
index 560623f..9e5755c 100644
--- a/app-portage/layman/layman-2.0.0_rc1.ebuild
+++ b/app-portage/layman/layman-2.0.0_rc1-r1.ebuild
@@ -34,6 +34,9 @@ RDEPEND="${COMMON_DEPS}
     )"
 RESTRICT_PYTHON_ABIS="2.4 3.*"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fix-mistracking-success.patch"
+}
 
 # Prevent running make
 src_compile() {