From 5909c1d7e290961eafe6802ff385719e08f4ff5a Mon Sep 17 00:00:00 2001
From: Brian Dolbec <dolsen@gentoo.org>
Date: Mon, 6 Jul 2015 14:53:34 -0700
Subject: [PATCH 2/2] Rework [PATCH v2 2/2] sync: Enable to set rsync extra
opts per repository
Update for changes made in previous commit
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>
---
pym/portage/sync/modules/rsync/__init__.py | 1 +
pym/portage/sync/modules/rsync/rsync.py | 10 +++-------
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/pym/portage/sync/modules/rsync/__init__.py b/pym/portage/sync/modules/rsync/__init__.py
index 9adc4c8..c717cd6 100644
--- a/pym/portage/sync/modules/rsync/__init__.py
+++ b/pym/portage/sync/modules/rsync/__init__.py
@@ -23,6 +23,7 @@ module_spec = {
'exists': 'Returns a boolean if the specified directory exists',
},
'validate_config': CheckSyncConfig,
+ 'module_specific_options': ("extra-opts",),
}
}
}
diff --git a/pym/portage/sync/modules/rsync/rsync.py b/pym/portage/sync/modules/rsync/rsync.py
index 2237901..27e60eb 100644
--- a/pym/portage/sync/modules/rsync/rsync.py
+++ b/pym/portage/sync/modules/rsync/rsync.py
@@ -44,11 +44,6 @@ class RsyncSync(NewBase):
return "RsyncSync"
- @staticmethod
- def specific_options():
- return ("extra-opts",)
-
-
def __init__(self):
NewBase.__init__(self, "rsync", RSYNC_PACKAGE_ATOM)
@@ -78,9 +73,10 @@ class RsyncSync(NewBase):
self.rsync_opts = self._rsync_opts_extend(opts, rsync_opts)
self.extra_rsync_opts = list()
- if self.repo.sync_rsync_extra_opts is not None:
+ extra_opts = self.repo.module_specific_options['sync_rsync_extra_opts']
+ if extra_opts is not None:
self.extra_rsync_opts.extend(portage.util.shlex_split(
- self.repo.sync_rsync_extra_opts))
+ extra_opts))
# Real local timestamp file.
self.servertimestampfile = os.path.join(
--
2.4.5