Fix for portage-2.3.0

New versions of portage have a "sourcefile" setting, and the
_native_kwargs function (copy+pasted from actual portage sync
module, which apparently was never needed) is gone.

diff --git a/portage/sync/modules/squashmirror/__init__.py b/portage/sync/modules/squashmirror/__init__.py
index d02acdc36500afc87bf4d606cf6af10404f83251..6421848b4665b936a3d33393b6adc3f96ce42edb 100644 (file)
--- a/portage/sync/modules/squashmirror/__init__.py
+++ b/portage/sync/modules/squashmirror/__init__.py
@@ -1,4 +1,4 @@
-# Copyright © 2015 Nick Bowler
+# Copyright © 2015-2016 Nick Bowler
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -35,6 +35,7 @@ module_spec = {
     'provides': {
         'squashmirror-module': {
             'name': 'squashmirror',
+            'sourcefile': 'squashmirror',
             'description': __doc__,
             'class': 'SquashMirror',
             'validate_config': CheckSquashConfig,

diff --git a/portage/sync/modules/squashmirror/squashmirror.py b/portage/sync/modules/squashmirror/squashmirror.py
index d4a5d3d5022b9a9188fbeb3625ebbae87b4aebee..115bfef52a1b6803a08e078a1d8b97c9b22f9ac6 100644 (file)
--- a/portage/sync/modules/squashmirror/squashmirror.py
+++ b/portage/sync/modules/squashmirror/squashmirror.py
@@ -1,4 +1,4 @@
-# Copyright © 2015 Nick Bowler
+# Copyright © 2015-2016 Nick Bowler
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -72,7 +72,7 @@ class SquashMirror(NewBase):
         args.extend(['-comp', opts['squash-compression']])
         args.extend(opts['squash-extra-opts'].split())
 
-        rc = spawn(args, **portage._native_kwargs(self.spawn_kwargs))
+        rc = spawn(args, **self.spawn_kwargs)
         if rc != os.EX_OK:
             self.err("command failed: %s" % " ".join(args))
             return (rc, False)