[gentoo-commits] proj/portage:plugin-sync commit in: pym/portage/sync/modules/rsync/

[Brian Dolbec]

commit:     4f85bc1ebf00aef9f0cd499d2e3db36f5fb904bb
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  8 03:04:27 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sat Feb  8 03:05:07 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=4f85bc1e

Separate out the actual sync code to a private function.

Fix new() to  return _sync().
Fix sync() to return new() or  _sysnc().

---
 pym/portage/sync/modules/rsync/rsync.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pym/portage/sync/modules/rsync/rsync.py b/pym/portage/sync/modules/rsync/rsync.py
index 12b4c9c..1c7abcc 100644
--- a/pym/portage/sync/modules/rsync/rsync.py
+++ b/pym/portage/sync/modules/rsync/rsync.py
@@ -56,14 +56,17 @@ class RsyncSync(object):
 		'''Rsync the repo'''
 		if kwargs:
 			self._kwargs(kwargs)
-			myopts = self.options.get('emerge_config').opts
-			spawn_kwargs = self.options.get('spawn_kwargs', None)
-			usersync_uid = self.options.get('usersync_uid', None)
 
 		if not self.exists():
-			if not self.new():
-				return (1, False)
+			return self.new()
+		return self._sync()
+
 
+	def _sync(self):
+		'''Internal sync function which performs only the sync'''
+		myopts = self.options.get('emerge_config').opts
+		spawn_kwargs = self.options.get('spawn_kwargs', None)
+		usersync_uid = self.options.get('usersync_uid', None)
 		enter_invalid = '--ask-enter-invalid' in myopts
 		out = portage.output.EOutput()
 		syncuri = self.repo.sync_uri
@@ -523,6 +526,6 @@ class RsyncSync(object):
 				self.logger(self.self.xterm_titles,
 					'Created New Directory %s ' % self.repo.location )
 		except IOError:
-			return False
-		return True
+			return (1, False)
+		return self._sync()