Ticket #158: pkgcore-0.4.3-rsync-proxy.2.patch

pkgcore/ebuild/portage_conf.py

@@ -125 +125 @@
     if timeout is not None:
         base['timeout'] = timeout.strip()
 
+    proxy = options.pop('RSYNC_PROXY', None)
+    if proxy is not None:
+        base['proxy'] = proxy.strip()
+
     excludes = options.pop('RSYNC_EXCLUDEFROM', None)
     if excludes is not None:
         extra_opts.extend('--exclude-from=%s' % x

pkgcore/sync/rsync.py

@@ -27 +27 @@
 
     default_retries = 5
     binary = "rsync"
+    use_proxy = False
 
     @classmethod
     def parse_uri(cls, raw_uri):
@@ -45 +46 @@
 
     pkgcore_config_type = ConfigHint({'basedir':'str', 'uri':'str',
         'timeout':'str', 'compress':'bool', 'excludes':'list',
-        'includes':'list', 'retries':'str', 'extra_opts':'list'},
+        'includes':'list', 'retries':'str', 'extra_opts':'list',
+        'proxy':'str'},
         typename='syncer')
 
     def __init__(self, basedir, uri, timeout=default_timeout,
         compress=False, excludes=(), includes=(),
-        retries=default_retries,
+        retries=default_retries, proxy=None,
         extra_opts=[]):
 
         uri = uri.rstrip(os.path.sep) + os.path.sep
@@ -67 +69 @@
         self.excludes = list(self.default_excludes) + list(excludes)
         self.includes = list(self.default_includes) + list(includes)
         self.retries = int(retries)
+        if proxy is not None:
+            self.use_proxy = True
+            self.sets_env = True
+            self.env = {'RSYNC_PROXY':proxy}
         self.is_ipv6 = "--ipv6" in self.opts or "-6" in self.opts
         self.is_ipv6 = self.is_ipv6 and socket.has_ipv6
 
@@ -75 +81 @@
         return uri[len("rsync://"):].split("@", 1)[-1].split("/", 1)[0]
 
     def _get_ips(self):
+        if self.use_proxy is True:
+            # If we're using a proxy, name resolution is best left to the proxy
+            yield self.hostname
+            return
+
         af_fam = socket.AF_INET
         if self.is_ipv6:
             af_fam = socket.AF_INET6