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

[Devan Franchini]

commit:     3b44feaf636c5c72b841d03bcf179968421fc35d
Author:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 30 23:20:38 2016 +0000
Commit:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 23:20:38 2016 +0000
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 0000000..af5ec4a
--- /dev/null
+++ b/app-portage/layman/files/layman-2.3.0-dir_check.patch
@@ -0,0 +1,31 @@
+From: Devan Franchini <twitch...@gentoo.org>
+Date: Sat, 30 Apr 2016 18:54:39 -0400
+Subject: [PATCH] Adds dir check for repos.conf rebuilding
+
+--- a/layman/updater.py        2015-02-07 22:38:49.000000000 -0500
++++ b/layman/updater.py        2016-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
 }