Re: [gentoo-portage-dev] [PATCH 2/2] portage/sync/controller.py: Make a per-repo postsync.d subdir

[Brian Dolbec]

On Sat, 06 Dec 2014 17:39:45 -0800
Zac Medico <zmedico@g.o> wrote:

> On 12/06/2014 04:53 PM, Brian Dolbec wrote:
> >
> > From cd6ef521f930578763ae043a4bc43281bba3bf0e Mon Sep 17 00:00:00
> > 2001 From: Brian Dolbec <dolsen@g.o>
> > Date: Sat, 6 Dec 2014 14:54:36 -0800
> > Subject: [PATCH 2/2] portage/sync/controller.py: Make a per-repo
> > postsync.d subdir
> >
> > This then runs per-repo postsync hooks only on scripts in the
> > per-repo subdir. This also maintains compatibility with existing
> > scripts in the postsync.d dir or other sub-directories.
>
> I think a separate repo.postsync.d directory would be a nicer way to
> organize things.

your wish is my...

From b02b4dff30a7930d5308e400a46c3e59bbee0350 Mon Sep 17 00:00:00 2001
From: Brian Dolbec <dolsen@g.o>
Date: Sat, 6 Dec 2014 14:54:36 -0800
Subject: [PATCH] portage/sync/controller.py: Make a repo.postsync.d directory

This then runs per-repo postsync hooks only on scripts in the repo.postsync.d directory.
This also maintains compatibility with existing scripts in the postsync.d dir or other
sub-directories.
Both postsync.d directories support subdirectories.
Scripts are run in sorted order.
---
 pym/portage/sync/controller.py | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/pym/portage/sync/controller.py b/pym/portage/sync/controller.py
index 21aa7a7..1127b75 100644
--- a/pym/portage/sync/controller.py
+++ b/pym/portage/sync/controller.py
@@ -88,19 +88,22 @@ class SyncManager(object):
 
 		self.module_controller = portage.sync.module_controller
 		self.module_names = self.module_controller.module_names
-		postsync_dir = os.path.join(self.settings["PORTAGE_CONFIGROOT"],
-			portage.USER_CONFIG_PATH, "postsync.d")
-		hooks = []
-		for root, dirs, names in os.walk(postsync_dir, topdown=True):
-			#print("root:", root, "dirs:", dirs, "names:", names)
-			for name in names:
-				filepath = os.path.join(root, name)
-				if os.access(filepath, os.X_OK):
-					hooks.append((filepath, name))
-				else:
-					writemsg_level(" %s postsync.d hook: '%s' is not executable\n"
-						% (warn("*"), _unicode_decode(name),), level=logging.WARN, noiselevel=2)
-		self.hooks = hooks
+		self.hooks = {}
+		for _dir in ["repo.postsync.d", "postsync.d"]:
+			postsync_dir = os.path.join(self.settings["PORTAGE_CONFIGROOT"],
+				portage.USER_CONFIG_PATH, _dir)
+			hooks = {}
+			for root, dirs, names in os.walk(postsync_dir, topdown=True):
+				#print("root:", root, "dirs:", dirs, "names:", names)
+				for name in names:
+					filepath = os.path.join(root, name)
+					if os.access(filepath, os.X_OK):
+						hooks[filepath] = name
+					else:
+						writemsg_level(" %s %s hook: '%s' is not executable\n"
+							% (warn("*"), _dir, _unicode_decode(name),),
+							level=logging.WARN, noiselevel=2)
+			self.hooks[_dir] = hooks
 
 
 	def get_module_descriptions(self, mod):
@@ -159,7 +162,11 @@ class SyncManager(object):
 
 	def perform_post_sync_hook(self, reponame, dosyncuri='', repolocation=''):
 		succeeded = os.EX_OK
-		for filepath, hook in self.hooks:
+		if reponame:
+			_hooks = self.hooks["repo.postsync.d"]
+		else:
+			_hooks = self.hooks["postsync.d"]
+		for filepath, hook in [(f,_hooks[f]) for f in sorted(_hooks)]:
 			writemsg_level("Spawning post_sync hook: %s\n"
 				% (_unicode_decode(hook)),
 				level=logging.ERROR, noiselevel=4)
-- 
2.1.2



-- 
Brian Dolbec <dolsen>