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 18:04:28 -0800
Zac Medico <zmedico@g.o> wrote:

> On 12/06/2014 05:54 PM, Brian Dolbec wrote:
> > 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.
>
> Thanks, LGTM.
>
> As an alternative to os.walk, we could use the
> portage.util._recursive_file_list function, which filters out VCS
> directories, hidden files, and files ending with ~. It yields the file
> names in sorted order, so it would make sense to store them in an
> OrderedDict so that they don't have to be sorted again later.

and again... ;)  grumble, grumble

From c005006b290ff6b2c72c94aaa29b033a57c4414a 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 | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/pym/portage/sync/controller.py b/pym/portage/sync/controller.py
index 21aa7a7..462b2c0 100644
--- a/pym/portage/sync/controller.py
+++ b/pym/portage/sync/controller.py
@@ -7,6 +7,7 @@ from __future__ import print_function
 import sys
 import logging
 import pwd
+from collections import OrderedDict
 
 import portage
 from portage import os
@@ -21,6 +22,7 @@ warn = create_color_func("WARN")
 from portage.package.ebuild.doebuild import _check_temp_dir
 from portage.metadata import action_metadata
 from portage import _unicode_decode
+from portage import util
 
 
 class TaskHandler(object):
@@ -88,19 +90,21 @@ 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)
+		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 = OrderedDict()
+			for filepath in util._recursive_file_list(postsync_dir):
+				name = filepath.split(postsync_dir)[1].lstrip(os.sep)
 				if os.access(filepath, os.X_OK):
-					hooks.append((filepath, name))
+					hooks[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
+					writemsg_level(" %s %s hook: '%s' is not executable\n"
+						% (warn("*"), _dir, _unicode_decode(name),),
+						level=logging.WARN, noiselevel=2)
+			self.hooks[_dir] = hooks
+		print(self.hooks)
 
 
 	def get_module_descriptions(self, mod):
@@ -159,15 +163,19 @@ 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 in _hooks:
 			writemsg_level("Spawning post_sync hook: %s\n"
-				% (_unicode_decode(hook)),
+				% (_unicode_decode(_hooks[filepath])),
 				level=logging.ERROR, noiselevel=4)
 			retval = portage.process.spawn([filepath,
 				reponame, dosyncuri, repolocation], env=self.settings.environ())
 			if retval != os.EX_OK:
 				writemsg_level(" %s Spawn failed for: %s, %s\n" % (bad("*"),
-					_unicode_decode(hook), filepath),
+					_unicode_decode(_hooks[filepath]), filepath),
 					level=logging.ERROR, noiselevel=-1)
 				succeeded = retval
 		return succeeded
-- 
2.1.2




-- 
Brian Dolbec <dolsen>