Bryn M. Reeves bmr-cymru
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #!/usr/bin/python3 | |
| from argparse import ArgumentParser | |
| import logging | |
| import sys | |
| import snapm | |
| import snapm.manager | |
| import snapm.manager.plugins | |
| from snapm._fsdiff import FsDiffer, DiffOptions |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/snapm/manager/_manager.py b/snapm/manager/_manager.py | |
| index 99dec7a..7624830 100644 | |
| --- a/snapm/manager/_manager.py | |
| +++ b/snapm/manager/_manager.py | |
| @@ -386,7 +386,11 @@ class Scheduler: | |
| sched_path = join(_SCHEDULE_D_PATH, sched_file) | |
| try: | |
| schedule = Schedule.from_file(sched_path) | |
| - except (SnapmArgumentError, JSONDecodeError, KeyError) as err: # pragma: no cover | |
| + except ( |
bmr-cymru
/ sos-six-six-six.patch
Created
December 22, 2015 12:29
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff -up sos-3.2.nosixforbryn/sos/archive.py.orig sos-3.2.nosixforbryn/sos/archive.py | |
| --- sos-3.2.nosixforbryn/sos/archive.py.orig 2015-03-02 20:03:32.585430036 +0000 | |
| +++ sos-3.2.nosixforbryn/sos/archive.py 2015-03-02 20:03:57.472599185 +0000 | |
| @@ -34,11 +34,6 @@ try: | |
| except ImportError: | |
| pass | |
| -# PYCOMPAT | |
| -import six | |
| -if six.PY3: |