bmr-cymru

usage: snapm snapset diffreport [-h] [--name-prefixes] [--no-headings] [-o FIELDS] [-O SORTFIELDS] [--json | --rows] [--separator SEP] [-t] [-p] [-w] [-c] [--include-system-dirs] [-C] [-f]
                                [-F] [-m MAX_FILE_SIZE] [-d MAX_DIFF_SIZE] [-H MAX_HASH_SIZE] [-i [INCLUDE_PATTERN ...]] [-x [EXCLUDE_PATTERN ...]] [-s PATH]
                                FROM TO

positional arguments:
  FROM                  Compare from snapshot set name or '.' for running system
  TO                    Compare to snapshot set name or '.' for running system

options:
  -h, --help            show this help message and exit

bmr-cymru

usage: snapm snapset diff [-h] [-t] [-p] [-w] [-c] [--include-system-dirs] [-C] [-f] [-F] [-m MAX_FILE_SIZE] [-d MAX_DIFF_SIZE] [-H MAX_HASH_SIZE] [-i [INCLUDE_PATTERN ...]]
                          [-x [EXCLUDE_PATTERN ...]] [-s PATH] [-o FORMAT]
                          FROM TO

positional arguments:
  FROM                  Compare from snapshot set name or '.' for running system
  TO                    Compare to snapshot set name or '.' for running system

options:
  -h, --help            show this help message and exit

bmr-cymru

#!/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

bmr-cymru

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

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: