Revision bump to fix broken sync function, bug 365123. New patch by Brian Dolbec

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

4 files changed, 94 insertions, 34 deletions

diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog
index ef4537296e81..715d7a80da64 100644
--- a/app-portage/layman/ChangeLog
+++ b/app-portage/layman/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-portage/layman
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.136 2011/04/27 13:23:50 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.137 2011/04/28 03:25:03 darkside Exp $
+
+*layman-1.4.2-r2 (28 Apr 2011)
+
+  28 Apr 2011; Jeremy Olexa <darkside@gentoo.org> -layman-1.4.2-r1.ebuild,
+  +layman-1.4.2-r2.ebuild, files/layman-1.4.2-python-compatbility-fix.patch:
+  Revision bump to fix broken sync function, bug 365123. New patch by Brian
+  Dolbec
 
 *layman-1.4.2-r1 (27 Apr 2011)
 
diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index 6e216871c1a6..db3227f1ab27 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX layman-1.4.2-python-compatbility-fix.patch 5258 RMD160 0aef885d590e127bc112bf5266b3033f3603b9b6 SHA1 0ce387467edea326ce53645a9157bd5e31f06e9a SHA256 e73c51b17e4700554f38e9c4428ba377710dd9fa328c0065602ec764cdf09d9f
+AUX layman-1.4.2-python-compatbility-fix.patch 7866 RMD160 4a83751b0548ab6ca8402babc86bf4cba9cb2f56 SHA1 70b4598cc2d0b3cecd63b17f36cdf83ad111b5a6 SHA256 6fc94c2954e66119817601fa072042c982def676f41a21bf164bd97d47025add
 DIST layman-1.2.3.tar.gz 46673 RMD160 f05e1b2cfdf4a3f47bff59116b947cde53af4a0b SHA1 3e80ddba7af177ca5e4b57fd77af1c4540f15458 SHA256 c00ff923b6d097f335c020bc9ee51bf80b41ab7f95450a7cf57614fa8176622a
 DIST layman-1.3.3.tar.gz 58880 RMD160 e3ff5dd4f9ca4c7c4682523995889d130e18d423 SHA1 66bbdbf37d0615a1fa6cadcc175c8f40f31e1859 SHA256 7ee701619baa3f64e1229ee1e36f9bb7125c543ac42f5b3ea6e06ceff02e57b5
 DIST layman-1.3.4.tar.gz 58943 RMD160 5b9d67ae39491bd3994bee506577a1b233fcf155 SHA1 0ed0e6e71ff5efd92bc5f122b25a16265d759099 SHA256 eeac99698fe139d6b948dbc0b49625d41455d49876f5b464f9f313dc35fa89d1
@@ -11,18 +8,7 @@ EBUILD layman-1.2.3.ebuild 2068 RMD160 1db74ce74c7a779c91d06047a158ef18fcd705d6
 EBUILD layman-1.3.3.ebuild 2238 RMD160 13fa793de7055c2ae11e0e77080e60907fd43070 SHA1 27458dd46bb6e82a052c75062c3fe629ee3e5607 SHA256 4256eafb74b138b96caff55e2b6c9de8d189225a6665c98fa5103e4bda73f0fb
 EBUILD layman-1.3.4.ebuild 2226 RMD160 46ecc41ede264a8a75cf3ac6372eee3b1688fc08 SHA1 fad40c25513887733d8c451a633e556903445891 SHA256 fa8bf73a3986084e3500cc78c1d79ba5c4ac23ac09ad34c8b80eda736e041c77
 EBUILD layman-1.4.1.ebuild 2213 RMD160 c24ad4f3da8b95342fd527bab5b09eddfddb99f2 SHA1 108b877d9e5b691bd694f96b41d44d0d6b43f228 SHA256 397d4989bee65d7e36a602e8b91c106bbdabe34810d0c887c102d34001bb7da0
-EBUILD layman-1.4.2-r1.ebuild 2347 RMD160 bf2d4482e75d7257fbeb9cf40ae6f3648c03b2c2 SHA1 b1960a900d85656314e7bb5643c027ce2563fc71 SHA256 1bca99dadb2e65762ebf8133bf2cac272a41310ddcbf25645f7dc76fa1c87758
+EBUILD layman-1.4.2-r2.ebuild 2350 RMD160 aa857fcce59b2e7edb5a261626f63fcf09fa3e6a SHA1 b2e72bf5a44c7e1fe4fb824a86d95c886218fbf5 SHA256 c5399f0f4be804cbe1054c366655d88e34814fecb68c28434e4929e9b9464c01
 EBUILD layman-9999.ebuild 2354 RMD160 dd718e5b22ff6f9bdb1de118ef11de31b03cac96 SHA1 5c6a8eb34ffd0097186b07d5baee3d5aec5835f5 SHA256 978a7af4c6022111ca28b01dd48b33baf72a5878b3fab518ffd95c8d28a1b472
-MISC ChangeLog 20141 RMD160 b93630b42fb6dd2bd99f675e6eabcc06e89352a9 SHA1 f69e768628a241ac81f8b7c1c3feb29663723014 SHA256 1401c7d95f768769499e175faf87bf0255487b60a488f519876885914bdd2e36
+MISC ChangeLog 20414 RMD160 54a8c362577b8db247fe5fc58835b6c260cc3bfe SHA1 8ef4795a132902dbade2e7b0fec058789f8181eb SHA256 8af6c4071e7415e92e2da08cb53f06e92866960b0756483713f883083da2dea4
 MISC metadata.xml 756 RMD160 3659553fed97aec8d38202e4e8753c9fba845493 SHA1 914504bda21647e11d258f2b2e6e955b8571e455 SHA256 04c1d9b81309254232aabeedc973e1f4c9f7300fdeeb95d364846f4c98bc347c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBCAAGBQJNuBjrAAoJEMOx0zmdw4Z1rgUIAKmcRJfClvNrUd0FfRY/4XOx
-4t9UWE1PiBDqggR9RfIykvNQ7bxaaqNI1mx4kU4cQ6zaZHG5T68vns7QgUyDx3Lg
-cal2E+xwMOJo+s4EeuAfSETkpkY/e3nTJjL9OR3fNdJF90OYPs9X3dpz+dDczOSe
-4TdRo9n/PuD7+NyYf5lOXXQWGODG+DAexr8D+pb6pq72xRfzfrgjoBvdfClWqy7r
-U+McVG4hMsvcVt22YdcbyDWUq4nVA4dwj0MlnM79FzXwB5q3aK1DTIAtrNsaVuOl
-pu5Dz8cK/XmYVesXkvQk2vAjmMjqX4gZzQmN0BTYF0CnbLsiJ1f9Abp+UhvieLs=
-=OXHZ
------END PGP SIGNATURE-----
diff --git a/app-portage/layman/files/layman-1.4.2-python-compatbility-fix.patch b/app-portage/layman/files/layman-1.4.2-python-compatbility-fix.patch
index 217ab0ad1448..1e83e93ca73b 100644
--- a/app-portage/layman/files/layman-1.4.2-python-compatbility-fix.patch
+++ b/app-portage/layman/files/layman-1.4.2-python-compatbility-fix.patch
@@ -1,21 +1,24 @@
-From 35815463599b2aa843edcc976920d996f6e4b0e2 Mon Sep 17 00:00:00 2001
-From: dol-sen <brian.dolbec@gmail.com>
-Date: Wed, 27 Apr 2011 03:58:06 -0700
-Subject: [PATCH] fix broken *args for python 2.5 and 2.6+.
- Also fixes my previous fix & resultant breakage.
+From edce984f2c034254af33fd6fe18bc1e2689581bf Mon Sep 17 00:00:00 2001
+From: Brian Dolbec <brian.dolbec@gmail.com>
+Date: Fri, 22 Apr 2011 23:53:19 -0700
+Subject: [PATCH] fix bug 363797 python-2.5 test errors.
+ fixes broken *args for python 2.5 and 2.6+.
  Passes tests for all python versions supported.
 
 ---
  bin/layman                   |    2 +-
- layman/overlays/bzr.py       |    2 +-
- layman/overlays/darcs.py     |    2 +-
- layman/overlays/git.py       |    2 +-
- layman/overlays/mercurial.py |    2 +-
+ layman/overlays/bzr.py       |    4 ++--
+ layman/overlays/cvs.py       |    4 ++--
+ layman/overlays/darcs.py     |    4 ++--
+ layman/overlays/git.py       |    4 ++--
+ layman/overlays/mercurial.py |    4 ++--
  layman/overlays/rsync.py     |    2 +-
  layman/overlays/source.py    |    4 ++--
  layman/overlays/svn.py       |    4 ++--
  layman/overlays/tar.py       |    2 +-
- 9 files changed, 11 insertions(+), 11 deletions(-)
+ 10 files changed, 17 insertions(+), 17 deletions(-)
+ mode change 100644 => 100755 layman/tests/dtest.py
+ mode change 100644 => 100755 layman/tests/external.py
 
 diff --git a/bin/layman b/bin/layman
 index b85f4fa..01ee0c8 100755
@@ -28,7 +31,7 @@ index b85f4fa..01ee0c8 100755
  # LAYMAN - A UTILITY TO SELECT AND UPDATE GENTOO OVERLAYS
  ################################################################################
 diff --git a/layman/overlays/bzr.py b/layman/overlays/bzr.py
-index 4725c98..b59cf6c 100644
+index e73c2f4..b59cf6c 100644
 --- a/layman/overlays/bzr.py
 +++ b/layman/overlays/bzr.py
 @@ -52,7 +52,7 @@ class BzrOverlay(OverlaySource):
@@ -40,8 +43,39 @@ index 4725c98..b59cf6c 100644
  
      def sync(self, base, quiet = False):
          '''Sync overlay.'''
+@@ -61,7 +61,7 @@ class BzrOverlay(OverlaySource):
+ 
+         # bzr pull --overwrite SOURCE
+         args = ['pull', '--overwrite', self.src]
+-        return self.run_command(*args, cwd=path([base, self.parent.name]))
++        return self.run_command(args, cwd=path([base, self.parent.name]))
+ 
+     def supported(self):
+         '''Overlay type supported?'''
+diff --git a/layman/overlays/cvs.py b/layman/overlays/cvs.py
+index f8fc277..4924ca4 100644
+--- a/layman/overlays/cvs.py
++++ b/layman/overlays/cvs.py
+@@ -83,7 +83,7 @@ class CvsOverlay(OverlaySource):
+         args.append(self.parent.name)
+         args.append(self.subpath)
+ 
+-        return self.run_command(*args, cwd=base, env=dict(CVSROOT=self.src))
++        return self.run_command(args, cwd=base, env=dict(CVSROOT=self.src))
+ 
+     def sync(self, base, quiet = False):
+         '''Sync overlay.'''
+@@ -96,7 +96,7 @@ class CvsOverlay(OverlaySource):
+             args.append('-q')
+         args.append('update')
+         args.append('-d')
+-        return self.run_command(*args, cwd=path([base, self.parent.name]))
++        return self.run_command(args, cwd=path([base, self.parent.name]))
+ 
+     def supported(self):
+         '''Overlay type supported?'''
 diff --git a/layman/overlays/darcs.py b/layman/overlays/darcs.py
-index 12e75ec..c062543 100644
+index 7d89477..c062543 100644
 --- a/layman/overlays/darcs.py
 +++ b/layman/overlays/darcs.py
 @@ -51,7 +51,7 @@ class DarcsOverlay(OverlaySource):
@@ -53,8 +87,17 @@ index 12e75ec..c062543 100644
  
      def sync(self, base, quiet = False):
          '''Sync overlay.'''
+@@ -60,7 +60,7 @@ class DarcsOverlay(OverlaySource):
+ 
+         # darcs pull --all SOURCE
+         args = ['pull', '--all', self.src]
+-        return self.run_command(*args, cwd=path([base, self.parent.name]))
++        return self.run_command(args, cwd=path([base, self.parent.name]))
+ 
+     def supported(self):
+         '''Overlay type supported?'''
 diff --git a/layman/overlays/git.py b/layman/overlays/git.py
-index 8db6c51..3b2608b 100644
+index caa73f4..3b2608b 100644
 --- a/layman/overlays/git.py
 +++ b/layman/overlays/git.py
 @@ -60,7 +60,7 @@ class GitOverlay(OverlaySource):
@@ -66,8 +109,17 @@ index 8db6c51..3b2608b 100644
  
      def sync(self, base, quiet = False):
          '''Sync overlay.'''
+@@ -70,7 +70,7 @@ class GitOverlay(OverlaySource):
+         args = ['pull']
+         if quiet:
+             args.append('-q')
+-        return self.run_command(*args, cwd=path([base, self.parent.name]))
++        return self.run_command(args, cwd=path([base, self.parent.name]))
+ 
+     def supported(self):
+         '''Overlay type supported?'''
 diff --git a/layman/overlays/mercurial.py b/layman/overlays/mercurial.py
-index ea3f9da..8bf919b 100644
+index 06cf59d..8bf919b 100644
 --- a/layman/overlays/mercurial.py
 +++ b/layman/overlays/mercurial.py
 @@ -51,7 +51,7 @@ class MercurialOverlay(OverlaySource):
@@ -79,6 +131,15 @@ index ea3f9da..8bf919b 100644
  
      def sync(self, base, quiet = False):
          '''Sync overlay.'''
+@@ -60,7 +60,7 @@ class MercurialOverlay(OverlaySource):
+ 
+         # hg pull -u SOURCE
+         args = ['pull', '-u', self.src]
+-        return self.run_command(*args, cwd=path([base, self.parent.name]))
++        return self.run_command(args, cwd=path([base, self.parent.name]))
+ 
+     def supported(self):
+         '''Overlay type supported?'''
 diff --git a/layman/overlays/rsync.py b/layman/overlays/rsync.py
 index 3a5a342..bf01462 100644
 --- a/layman/overlays/rsync.py
@@ -143,6 +204,12 @@ index 919f4df..612b6b6 100644
  
          os.unlink(pkg)
          return result
+diff --git a/layman/tests/dtest.py b/layman/tests/dtest.py
+old mode 100644
+new mode 100755
+diff --git a/layman/tests/external.py b/layman/tests/external.py
+old mode 100644
+new mode 100755
 -- 
-1.7.3.4
+1.7.4.1
 
diff --git a/app-portage/layman/layman-1.4.2-r1.ebuild b/app-portage/layman/layman-1.4.2-r2.ebuild
index 7bfa7c5a5a41..454743cc330b 100644
--- a/app-portage/layman/layman-1.4.2-r1.ebuild
+++ b/app-portage/layman/layman-1.4.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.4.2-r1.ebuild,v 1.1 2011/04/27 13:23:50 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.4.2-r2.ebuild,v 1.1 2011/04/28 03:25:03 darkside Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2:2.5"