Gentoo Archives: gentoo-commits

From: Jauhien Piatlicki <piatlicki@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/g-sorcery:master commit in: /, g_sorcery/
Date: Fri, 02 Aug 2013 10:12:55
Message-Id: 1375438354.a160d75cf44f4973037260823b8d427bfff62557.jauhien@gentoo
1 commit: a160d75cf44f4973037260823b8d427bfff62557
2 Author: Jauhien Piatlicki (jauhien) <piatlicki <AT> gmail <DOT> com>
3 AuthorDate: Fri Aug 2 10:12:34 2013 +0000
4 Commit: Jauhien Piatlicki <piatlicki <AT> gmail <DOT> com>
5 CommitDate: Fri Aug 2 10:12:34 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/g-sorcery.git;a=commit;h=a160d75c
7
8 metadata/layout.conf support added
9
10 ---
11 g_sorcery/backend.py | 11 ++++++++++-
12 gs-elpa.json | 6 ++++--
13 2 files changed, 14 insertions(+), 3 deletions(-)
14
15 diff --git a/g_sorcery/backend.py b/g_sorcery/backend.py
16 index 9e2ef66..4b356b3 100644
17 --- a/g_sorcery/backend.py
18 +++ b/g_sorcery/backend.py
19 @@ -21,7 +21,7 @@ if py2k:
20 else:
21 import configparser
22
23 -from .g_collections import Package
24 +from .g_collections import Package, elist
25 from .fileutils import fast_manifest, FileJSON
26 from .exceptions import DependencyError, DigestError
27 from .logger import Logger
28 @@ -451,6 +451,15 @@ class Backend(object):
29 os.makedirs(os.path.join(overlay, 'profiles'))
30 os.system("echo " + os.path.basename(overlay) + '>' + \
31 os.path.join(overlay, 'profiles', 'repo_name'))
32 +
33 + os.makedirs(os.path.join(overlay, 'metadata'))
34 + if not "masters" in config["repositories"][args.repository]:
35 + masters = elist(["gentoo"])
36 + else:
37 + masters = elist(config["repositories"][args.repository]["masters"])
38 + with open(os.path.join(overlay, 'metadata', 'layout.conf'), 'w') as f:
39 + f.write("repo-name = %s\n" % overlay)
40 + f.write("masters = %s\n" % masters)
41
42 if args.digest:
43 ebuild_g = self.ebuild_g_with_digest_class(pkg_db)
44
45 diff --git a/gs-elpa.json b/gs-elpa.json
46 index fafc5af..03f4148 100644
47 --- a/gs-elpa.json
48 +++ b/gs-elpa.json
49 @@ -5,10 +5,12 @@
50 "repo_uri": "http://elpa.gnu.org/packages/"
51 },
52 "marmalade": {
53 - "repo_uri": "http://marmalade-repo.org/packages/"
54 + "repo_uri": "http://marmalade-repo.org/packages/",
55 + "masters": ["gentoo", "gnu-elpa"]
56 },
57 "melpa": {
58 - "repo_uri": "http://melpa.milkbox.net/packages/"
59 + "repo_uri": "http://melpa.milkbox.net/packages/",
60 + "masters": ["gentoo", "gnu-elpa"]
61 }
62 },
63 "common_config": {