| 1 |
Signed-off-by: Aaron Bauman <bman@g.o> |
| 2 |
--- |
| 3 |
lib/portage/_sets/files.py | 12 ++++++------ |
| 4 |
1 file changed, 6 insertions(+), 6 deletions(-) |
| 5 |
|
| 6 |
diff --git a/lib/portage/_sets/files.py b/lib/portage/_sets/files.py |
| 7 |
index e045701ff..57e5aa34f 100644 |
| 8 |
--- a/lib/portage/_sets/files.py |
| 9 |
+++ b/lib/portage/_sets/files.py |
| 10 |
@@ -1,4 +1,4 @@ |
| 11 |
-# Copyright 2007-2014 Gentoo Foundation |
| 12 |
+# Copyright 2007-2020 Gentoo Authors |
| 13 |
# Distributed under the terms of the GNU General Public License v2 |
| 14 |
|
| 15 |
import errno |
| 16 |
@@ -27,7 +27,7 @@ class StaticFileSet(EditablePackageSet): |
| 17 |
_operations = ["merge", "unmerge"] |
| 18 |
_repopath_match = re.compile(r'.*\$\{repository:(?P<reponame>.+)\}.*') |
| 19 |
_repopath_sub = re.compile(r'\$\{repository:(?P<reponame>.+)\}') |
| 20 |
- |
| 21 |
+ |
| 22 |
def __init__(self, filename, greedy=False, dbapi=None): |
| 23 |
super(StaticFileSet, self).__init__(allow_repo=True) |
| 24 |
self._filename = filename |
| 25 |
@@ -96,7 +96,7 @@ class StaticFileSet(EditablePackageSet): |
| 26 |
atoms = iter(data) |
| 27 |
self._setAtoms(atoms) |
| 28 |
self._mtime = mtime |
| 29 |
- |
| 30 |
+ |
| 31 |
def singleBuilder(self, options, settings, trees): |
| 32 |
if not "filename" in options: |
| 33 |
raise SetConfigError(_("no filename specified")) |
| 34 |
@@ -111,7 +111,7 @@ class StaticFileSet(EditablePackageSet): |
| 35 |
raise SetConfigError(_("Could not find repository '%s'") % match.groupdict()["reponame"]) |
| 36 |
return StaticFileSet(filename, greedy=greedy, dbapi=trees["vartree"].dbapi) |
| 37 |
singleBuilder = classmethod(singleBuilder) |
| 38 |
- |
| 39 |
+ |
| 40 |
def multiBuilder(self, options, settings, trees): |
| 41 |
rValue = {} |
| 42 |
directory = options.get("directory", |
| 43 |
@@ -185,13 +185,13 @@ class ConfigFileSet(PackageSet): |
| 44 |
def load(self): |
| 45 |
data, errors = self.loader.load() |
| 46 |
self._setAtoms(iter(data)) |
| 47 |
- |
| 48 |
+ |
| 49 |
def singleBuilder(self, options, settings, trees): |
| 50 |
if not "filename" in options: |
| 51 |
raise SetConfigError(_("no filename specified")) |
| 52 |
return ConfigFileSet(options["filename"]) |
| 53 |
singleBuilder = classmethod(singleBuilder) |
| 54 |
- |
| 55 |
+ |
| 56 |
def multiBuilder(self, options, settings, trees): |
| 57 |
rValue = {} |
| 58 |
directory = options.get("directory", |
| 59 |
-- |
| 60 |
2.28.0 |
Archives