| 1 |
Signed-off-by: Aaron Bauman <bman@g.o> |
| 2 |
--- |
| 3 |
lib/portage/emaint/modules/merges/merges.py | 4 ++-- |
| 4 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 5 |
|
| 6 |
diff --git a/lib/portage/emaint/modules/merges/merges.py b/lib/portage/emaint/modules/merges/merges.py |
| 7 |
index a2b70edb8..775dc59d2 100644 |
| 8 |
--- a/lib/portage/emaint/modules/merges/merges.py |
| 9 |
+++ b/lib/portage/emaint/modules/merges/merges.py |
| 10 |
@@ -1,4 +1,4 @@ |
| 11 |
-# Copyright 2005-2014 Gentoo Foundation |
| 12 |
+# Copyright 2005-2020 Gentoo Authors |
| 13 |
# Distributed under the terms of the GNU General Public License v2 |
| 14 |
|
| 15 |
import portage |
| 16 |
@@ -93,7 +93,7 @@ class MergesHandler: |
| 17 |
def __init__(self): |
| 18 |
"""Create MergesHandler object.""" |
| 19 |
eroot = portage.settings['EROOT'] |
| 20 |
- tracking_path = os.path.join(eroot, PRIVATE_PATH, 'failed-merges'); |
| 21 |
+ tracking_path = os.path.join(eroot, PRIVATE_PATH, 'failed-merges') |
| 22 |
self._tracking_file = TrackingFile(tracking_path) |
| 23 |
self._vardb_path = os.path.join(eroot, VDB_PATH) |
| 24 |
|
| 25 |
-- |
| 26 |
2.28.0 |
Archives