* [gentoo-commits] proj/layman:master commit in: layman/overlays/, layman/, etc/
@ 2012-10-07 23:40 Brian Dolbec
0 siblings, 0 replies; 2+ messages in thread
From: Brian Dolbec @ 2012-10-07 23:40 UTC (permalink / raw
To: gentoo-commits
commit: faf6c74c1aa866d62137dcf203b3bca7a0e32634
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 7 23:38:41 2012 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sun Oct 7 23:38:41 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=faf6c74c
Add setting the default user name and email when adding new git based overlays. Bug 433687.
---
etc/layman.cfg | 10 ++++++++++
layman/config.py | 2 ++
layman/overlays/git.py | 28 ++++++++++++++++++++++------
3 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/etc/layman.cfg b/etc/layman.cfg
index 7f7baab..a99ab9d 100644
--- a/etc/layman.cfg
+++ b/etc/layman.cfg
@@ -188,3 +188,13 @@ news_reporter: portage
#tar_postsync :
#g-common_postsync :
+
+#-----------------------------------------------------------
+# Layman user info
+#
+# The user name and email to use when adding new repos
+#
+#git_user : layman
+#git_email : layman@localhost
+
+
diff --git a/layman/config.py b/layman/config.py
index 8430221..8ac3ebf 100644
--- a/layman/config.py
+++ b/layman/config.py
@@ -134,6 +134,8 @@ class BareConfig(object):
'svn_postsync' : '',
'tar_postsync' : '',
'g-common_postsync' : '',
+ 'git_user': 'layman',
+ 'git_email': 'layman@localhost',
}
self._options = {
'config': config if config else self._defaults['config'],
diff --git a/layman/overlays/git.py b/layman/overlays/git.py
index 308c81f..e15f26d 100644
--- a/layman/overlays/git.py
+++ b/layman/overlays/git.py
@@ -67,12 +67,28 @@ class GitOverlay(OverlaySource):
args.append(cfg_opts)
args.append(fix_git_source(self.src))
args.append(target)
- return self.postsync(
- # adding cwd=base due to a new git bug in selinux due to
- # not having user_home_dir_t and portage_fetch_t permissions
- # but changing dir works around it.
- self.run_command(self.command(), args, cmd=self.type, cwd=base),
- cwd=target)
+ success = False
+ # adding cwd=base due to a new git bug in selinux due to
+ # not having user_home_dir_t and portage_fetch_t permissions
+ # but changing dir works around it.
+ success = self.run_command(self.command(), args, cmd=self.type, cwd=base)
+ self.output.debug("cloned git repo...success=%s" % str(success), 8)
+ success = self.set_user(target)
+ return self.postsync(success, cwd=target)
+
+ def set_user(self, target):
+ '''Set dummy user.name and user.email to prevent possible errors'''
+ user = '"%s"' % self.config['git_user']
+ email = '"%s"' % self.config['git_email']
+ args = ['config', 'user.name', user]
+ self.output.debug("set git user info...args=%s" % ' '.join(args), 8)
+ failure = self.run_command(self.command(), args, cmd=self.type, cwd=target)
+ if failure:
+ self.output.debug("set git user info...failure setting name")
+ return failure
+ args = ['config', 'user.email', email]
+ self.output.debug("set git user info...args=%s" % ' '.join(args), 8)
+ return self.run_command(self.command(), args, cmd=self.type, cwd=target)
def sync(self, base):
'''Sync overlay.'''
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/layman:master commit in: layman/overlays/, layman/, etc/
@ 2013-08-18 14:48 Brian Dolbec
0 siblings, 0 replies; 2+ messages in thread
From: Brian Dolbec @ 2013-08-18 14:48 UTC (permalink / raw
To: gentoo-commits
commit: f0786a8d7c54a552842bf669cde97c62e12c68bd
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 18 14:46:56 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sun Aug 18 14:46:56 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=f0786a8d
Add new repository type g-sorcery created by Jauhien Piatlicki
From Gentoo 2013 GSOC project: Framework for automated ebuild generators.
---
etc/layman.cfg | 4 ++++
layman/config.py | 4 ++++
layman/overlays/overlay.py | 2 ++
3 files changed, 10 insertions(+)
diff --git a/etc/layman.cfg b/etc/layman.cfg
index f1d730a..72f7e2f 100644
--- a/etc/layman.cfg
+++ b/etc/layman.cfg
@@ -164,6 +164,7 @@ news_reporter: portage
#svn_command : /usr/bin/svn
#tar_command : /bin/tar
#g-common_command : /usr/bin/g-common
+#g-sorcery_command : /usr/bin/g-sorcery
#-----------------------------------------------------------
@@ -199,6 +200,8 @@ news_reporter: portage
#svn_syncopts :
#g-common_generateopts :
#g-common_syncopts :
+#g-sorcery_generateopts :
+#g-sorcery_syncopts :
#-----------------------------------------------------------
@@ -222,6 +225,7 @@ news_reporter: portage
#svn_postsync :
#tar_postsync :
#g-common_postsync :
+#g-sorcery_postsync :
#-----------------------------------------------------------
diff --git a/layman/config.py b/layman/config.py
index 9586835..576ed05 100644
--- a/layman/config.py
+++ b/layman/config.py
@@ -119,6 +119,7 @@ class BareConfig(object):
'darcs_command': path([self.root, EPREFIX,'/usr/bin/darcs']),
'git_command': path([self.root, EPREFIX,'/usr/bin/git']),
'g-common_command': path([self.root, EPREFIX,'/usr/bin/g-common']),
+ 'g-sorcery_command': path([self.root, EPREFIX,'/usr/bin/g-sorcery']),
'mercurial_command': path([self.root, EPREFIX,'/usr/bin/hg']),
'rsync_command': path([self.root, EPREFIX,'/usr/bin/rsync']),
'svn_command': path([self.root, EPREFIX,'/usr/bin/svn']),
@@ -139,6 +140,8 @@ class BareConfig(object):
'svn_syncopts' : '',
'g-common_generateopts' : '',
'g-common_syncopts' : '',
+ 'g-sorcery_generateopts' : '',
+ 'g-sorcery_syncopts' : '',
'bzr_postsync' : '',
'cvs_postsync' : '',
'darcs_postsync' : '',
@@ -148,6 +151,7 @@ class BareConfig(object):
'svn_postsync' : '',
'tar_postsync' : '',
'g-common_postsync' : '',
+ 'g-sorcery_postsync' : '',
'git_user': 'layman',
'git_email': 'layman@localhost',
}
diff --git a/layman/overlays/overlay.py b/layman/overlays/overlay.py
index f2cfc92..65c148b 100755
--- a/layman/overlays/overlay.py
+++ b/layman/overlays/overlay.py
@@ -40,6 +40,7 @@ from layman.overlays.bzr import BzrOverlay
from layman.overlays.darcs import DarcsOverlay
from layman.overlays.git import GitOverlay
from layman.overlays.g_common import GCommonOverlay
+from layman.overlays.g_sorcery import GSorceryOverlay
from layman.overlays.mercurial import MercurialOverlay
from layman.overlays.cvs import CvsOverlay
from layman.overlays.svn import SvnOverlay
@@ -55,6 +56,7 @@ from layman.overlays.tar import TarOverlay
OVERLAY_TYPES = dict((e.type_key, e) for e in (
GitOverlay,
GCommonOverlay,
+ GSorceryOverlay,
CvsOverlay,
SvnOverlay,
RsyncOverlay,
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-18 14:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-07 23:40 [gentoo-commits] proj/layman:master commit in: layman/overlays/, layman/, etc/ Brian Dolbec
-- strict thread matches above, loose matches on Subject: below --
2013-08-18 14:48 Brian Dolbec
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox