[gentoo-commits] repo/gentoo:master commit in: app-portage/layman/, app-portage/layman/files/

[Brian Dolbec]

commit: 45f3ad5b75ba8bdef00c2b149f8df3c11fdfec79
Author: Brian Dolbec  gentoo  org>
AuthorDate: Thu Feb  2 02:25:15 2017 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Thu Feb  2 02:25:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45f3ad5b

app-portage/layman: Re-add 2.2.0-r7 due to missing keywords for g-sorcery

Clean up files dir.

Package-Manager: Portage-2.3.3_p38, Repoman-2.3.1_p31

 app-portage/layman/Manifest|  1 +
 ...yman-2.1.0-incorrect-import-make-conf-fix.patch | 29 ---
 .../layman/files/layman-2.1.0-local_overlay.patch  | 27 ---
 app-portage/layman/layman-2.2.0-r7.ebuild  | 89 ++
 4 files changed, 90 insertions(+), 56 deletions(-)

diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index 6dd75d6..2064836 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -1,3 +1,4 @@
 DIST layman-2.0.0.tar.gz 81184 SHA256 
5843035ae4cc069693c05cf9821dae3d89d3ea7e2115b8137ea5a4a6c2807f33 SHA512 
30756464d71ab1e047036550b6500d7e57999d808ebe3efba1d1ae6c037f8ca777ba704a4981d75a90285133635027a7bc13f1890f34823de33ae991ed99e2da
 WHIRLPOOL 
ec362189c4757ee032dc93e079ea0f5b291d5652231a84f1175fb308ca5622882d5008f23fd6a3d5143ff0dc98c91632d19c2e6604dcaa9b6a550bc902d79c1a
+DIST layman-2.2.0.tar.gz 116210 SHA256 
4a10cfd3eb354e993886369995ae9b1243418e0370c6aabd4d0ef6c5b387b7a2 SHA512 
34cac041d7b64274debdbc42cab079fd3bb3aee511ea9e80db726df0f828207d79a5262788483ced5cbf49924e3aa4f19fe21439c98dceea973d8f83473c2e41
 WHIRLPOOL 
8c5d3cbbfef35c6294dfac899cb42f49e0761745573721e38b7d6c9ac48031f95bbb961c9d8dd9d309e4672cc1e5b050107ba025a9f28127e5d7d6d9a73a6e9a
 DIST layman-2.4.1.tar.gz 130388 SHA256 
545792a15a0a2514c79f1b3090aceef15e413c656f294b6ff84f8a36da7aa2da SHA512 
bdb713d4c7d3773129b45a385068278958040759bb564e48cfda4dda9da5224ccaa7833fce3d06151ed1fecddbb6f1a059db6e71534d0e887dff12640af6c806
 WHIRLPOOL 
b6ef18f8f3633e9bb2a08df620306441f8352174dc66f2bbb68613cff0796e0914f7008de4f185167815ba3267c3b63a4fe22d2bcd794f70cd78bc20e706d7d8
 DIST layman-2.4.2.tar.gz 137893 SHA256 
e84f8b745dd160bacf7b08dfd95b5c6d117dc8721edca370600f29ef0676ff92 SHA512 
9d32269f51f896c554e6cbf8a674c50009bce48dd83dfe773b08b75bafd567eb75c26c227ab3a60bc83c1ed511862a3979b8d851befe8ad16fd0847eb91337cf
 WHIRLPOOL 
eba1844f2279071947601a8baa9424db24e5bd1ba2d9ac14f90e4ae2c3e0b566dabf10378cf6286225d85d11940add45239df8cb5b150eea227b47223ce65485

diff --git 
a/app-portage/layman/files/layman-2.1.0-incorrect-import-make-conf-fix.patch 
b/app-portage/layman/files/layman-2.1.0-incorrect-import-make-conf-fix.patch
deleted file mode 100644
index 1396e32..
--- a/app-portage/layman/files/layman-2.1.0-incorrect-import-make-conf-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8f6005fcfb9d2012bba428863f89b6b9168c8226 Mon Sep 17 00:00:00 2001
-From: Devan Franchini 
-Date: Thu, 22 May 2014 22:57:08 -0400
-Subject: [PATCH] updater.py: Fixes incorrect import for make.conf class
-
-X-Gentoo-Bug: 521724
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/521724

- layman/updater.py  |  4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/layman/updater.py b/layman/updater.py
-index 26aeed2..b2187e3 100644
 a/layman/updater.py
-+++ b/layman/updater.py
-@@ -155,8 +155,8 @@ class Main(object):
- self.output.info("  Creating layman's make.conf file")
- # create layman's %(storage)s/make.conf
- # so portage won't error
--from layman.makeconf import MakeConf
--maker = MakeConf(self.config, None)
-+from layman.makeconf import ConfigHandler
-+maker = ConfigHandler(self.config, None)
- maker.write()
- 
- 
--- 
-1.8.5.5
-

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
deleted file mode 100644
index fbe5cd0..
--- a/app-portage/layman/files/layman-2.1.0-local_overlay.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d0e5d9120c27f678e9039bb2f65cfc0e457be6c7 Mon Sep 17 00:00:00 2001
-From: Douglas Freed 
-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)
- 

[gentoo-commits] repo/gentoo:master commit in: app-portage/layman/, app-portage/layman/files/

[Brian Dolbec]

commit: 70376e296ccf04cd15c03db6fd7a8c83bf0cf09f
Author: Brian Dolbec  gentoo  org>
AuthorDate: Tue May 31 14:19:21 2016 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Tue May 31 14:20:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70376e29

app-portage/layman: Bump with patch, fixes bug 582154

Package-Manager: portage-2.3.0_rc1

 .../layman-2.4.1-sourcefileattributechanges.patch  | 42 ++
 ...{layman-2.4.1.ebuild => layman-2.4.1-r1.ebuild} |  4 +++
 2 files changed, 46 insertions(+)

diff --git 
a/app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch 
b/app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch
new file mode 100644
index 000..207f474
--- /dev/null
+++ b/app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch
@@ -0,0 +1,42 @@
+From 90fe6724d0a8d1ebfe6443dee118432e20432b8b Mon Sep 17 00:00:00 2001
+From: Brian Dolbec 
+Date: Tue, 10 May 2016 15:12:02 -0700
+Subject: [PATCH] layman/module.py: Fix commit 63808ef00f94 mis-applied
+ 'sourcefile' attribute changes
+
+It was not looking for the 'sourcefile' attribute first, then falling back to 
the kidname for
+backward compatibility.
+It was incorrectly looking for an ImportError, instead of a 'sourcefile' 
KeyError.
+The filepath of the affected file for the error message had an extra leading 
'_'.
+Add the module name to the warning message.
+---
+ layman/module.py | 11 ++-
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/layman/module.py b/layman/module.py
+index 08bcbc2..092418f 100644
+--- a/layman/module.py
 b/layman/module.py
+@@ -49,13 +49,14 @@ class Module(object):
+ kid = self.module_spec['provides'][submodule]
+ kidname = kid['name']
+ try:
++kid['module_name'] = '.'.join([mod_name, kid['sourcefile']])
++except KeyError:
+ kid['module_name'] = '.'.join([mod_name, kidname])
+-except ImportError:
+-kid['module_name'] = '.'.join([mod_name, self.name])
+-f = self.__module.__file__
+-msg = 'Module.__initialize(); module spec is old, missing '\
++f = self._module.__file__
++msg = 'Module.__initialize(); %(module)s module spec is old, 
missing '\
+   'attribute: \'sourcefile\'.\nBackward compatibility '\
+-  'may be removed in the future.\nFile: %(f)s' % {'f': f}
++  'may be removed in the future.\nFile: %(f)s' % {
++  'module': self.name, 'f': f}
+ self.output.warn(msg)
+ kid['is_imported'] = False
+ self.kids[kidname] = kid
+-- 
+2.8.3
+

diff --git a/app-portage/layman/layman-2.4.1.ebuild 
b/app-portage/layman/layman-2.4.1-r1.ebuild
similarity index 96%
rename from app-portage/layman/layman-2.4.1.ebuild
rename to app-portage/layman/layman-2.4.1-r1.ebuild
index 79dcd8c..748813b 100644
--- a/app-portage/layman/layman-2.4.1.ebuild
+++ b/app-portage/layman/layman-2.4.1-r1.ebuild
@@ -41,6 +41,10 @@ RDEPEND="
>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
"
 
+PATCHES=(
+   "${FILESDIR}/layman-2.4.1-sourcefileattributechanges.patch"
+)
+
 layman_check_kernel_config() {
local CONFIG_CHECK
use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS"

[gentoo-commits] repo/gentoo:master commit in: app-portage/layman/, app-portage/layman/files/

[Devan Franchini]

commit: 3b44feaf636c5c72b841d03bcf179968421fc35d
Author: Devan Franchini  gentoo  org>
AuthorDate: Sat Apr 30 23:20:38 2016 +
Commit: Devan Franchini  gentoo  org>
CommitDate: Sat Apr 30 23:20:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b44feaf

Adds patch to check for the existence of repos.conf file, bug #574188

Package-Manager: portage-2.2.27

 .../layman/files/layman-2.3.0-dir_check.patch  | 31 ++
 app-portage/layman/layman-2.3.0-r1.ebuild  |  1 +
 2 files changed, 32 insertions(+)

diff --git a/app-portage/layman/files/layman-2.3.0-dir_check.patch 
b/app-portage/layman/files/layman-2.3.0-dir_check.patch
new file mode 100644
index 000..af5ec4a
--- /dev/null
+++ b/app-portage/layman/files/layman-2.3.0-dir_check.patch
@@ -0,0 +1,31 @@
+From: Devan Franchini 
+Date: Sat, 30 Apr 2016 18:54:39 -0400
+Subject: [PATCH] Adds dir check for repos.conf rebuilding
+
+--- a/layman/updater.py2015-02-07 22:38:49.0 -0500
 b/layman/updater.py2016-04-30 18:54:39.103894343 -0400
+@@ -182,6 +182,24 @@
+ 
+ def create_repos_conf(self):
+ self.output.info("  Creating layman's repos.conf file")
++
++if os.path.isdir(self.config['repos_conf']):
++msg = '  create_repos_conf() error: %s is a directory and will\n'\
++  '  not be written to.' % self.config['repos_conf']
++self.output.error(msg)
++return None
++
++conf_dir = os.path.dirname(self.config['repos_conf'])
++
++if not os.path.isdir(conf_dir):
++try:
++os.mkdir(conf_dir)
++except OSError as e:
++self.output.error('  create_repos_conf() error creating: %s: 
'\
++   % conf_dir)
++self.output.error('  "%s"' % e)
++return None
++
+ layman_inst = LaymanAPI(config=self.config)
+ overlays = {}
+ for ovl in layman_inst.get_installed():

diff --git a/app-portage/layman/layman-2.3.0-r1.ebuild 
b/app-portage/layman/layman-2.3.0-r1.ebuild
index 090a8ff..d3a9a16 100644
--- a/app-portage/layman/layman-2.3.0-r1.ebuild
+++ b/app-portage/layman/layman-2.3.0-r1.ebuild
@@ -61,6 +61,7 @@ python_prepare_all()  {
esetup.py setup_plugins
distutils-r1_python_prepare_all
#rm "${S}"/"${PN}"/tests/dtest.py
+   epatch "${FILESDIR}"/${P}-dir_check.patch
eprefixify etc/layman.cfg layman/config.py
 }