commit: 8902ca15d7b443a6fdfdc011eb968f2d10d2edbb
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 21 01:49:35 2014 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Oct 21 05:04:08 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8902ca15
git sync: remove unneeded post_sync
None of the remaining post_sync code is really needed. Also, fix
indent of return near the end of the _sync method.
---
pym/portage/sync/modules/git/git.py | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/pym/portage/sync/modules/git/git.py
b/pym/portage/sync/modules/git/git.py
index d8c5a32..7c28139 100644
--- a/pym/portage/sync/modules/git/git.py
+++ b/pym/portage/sync/modules/git/git.py
@@ -69,11 +69,11 @@ class GitSync(SyncBase):
msg = "!!! git clone error in %s" % self.repo.location
self.logger(self.xterm_titles, msg)
writemsg_level(msg + "\n", level=logging.ERROR,
noiselevel=-1)
- return (exitcode, False)
+ return (exitcode, False)
msg = ">>> Git clone successful"
self.logger(self.xterm_titles, msg)
writemsg_level(msg + "\n")
- return self.post_sync(portdb, self.repo.location, emerge_config)
+ return (os.EX_OK, True)
def _sync(self):
@@ -101,18 +101,4 @@ class GitSync(SyncBase):
msg = ">>> Git pull successful: %s" % self.repo.location
self.logger(self.xterm_titles, msg)
writemsg_level(msg + "\n")
- return self.post_sync(portdb, self.repo.location, emerge_config)
-
-
- def post_sync(self, portdb, location, emerge_config):
- '''repo.sync_type == "git":
- # NOTE: Do this after reloading the config, in case
- # it did not exist prior to sync, so that the config
- # and portdb properly account for its existence.
- '''
- # avoid circular import for now
- from _emerge.actions import load_emerge_config, adjust_configs
- # Reload the whole config from scratch.
- settings, trees, mtimedb =
load_emerge_config(emerge_config=emerge_config)
- adjust_configs(emerge_config.opts, emerge_config.trees)
return (os.EX_OK, True)
