| 1 |
commit: f02e423914eab4f5740e109db222a23763b07af6 |
| 2 |
Author: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 4 00:16:17 2020 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 4 01:08:23 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f02e4239 |
| 7 |
|
| 8 |
lib/portage/emaint/modules/merges/merges.py: fix unnecessary-semicolon |
| 9 |
|
| 10 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
| 11 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 12 |
|
| 13 |
lib/portage/emaint/modules/merges/merges.py | 4 ++-- |
| 14 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/lib/portage/emaint/modules/merges/merges.py b/lib/portage/emaint/modules/merges/merges.py |
| 17 |
index a2b70edb8..775dc59d2 100644 |
| 18 |
--- a/lib/portage/emaint/modules/merges/merges.py |
| 19 |
+++ b/lib/portage/emaint/modules/merges/merges.py |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 2005-2014 Gentoo Foundation |
| 22 |
+# Copyright 2005-2020 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
import portage |
| 26 |
@@ -93,7 +93,7 @@ class MergesHandler: |
| 27 |
def __init__(self): |
| 28 |
"""Create MergesHandler object.""" |
| 29 |
eroot = portage.settings['EROOT'] |
| 30 |
- tracking_path = os.path.join(eroot, PRIVATE_PATH, 'failed-merges'); |
| 31 |
+ tracking_path = os.path.join(eroot, PRIVATE_PATH, 'failed-merges') |
| 32 |
self._tracking_file = TrackingFile(tracking_path) |
| 33 |
self._vardb_path = os.path.join(eroot, VDB_PATH) |
Archives