[reprotest] 01/03: Use "artifact_pattern" consistently instead of sometimes "artifact"

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository reprotest.

commit 5ce0cf109a8ff49365a16ac596a9bd301f12dc85
Author: Ximin Luo <infinity0 at debian.org>
Date:   Mon Sep 11 14:53:51 2017 +0200

    Use "artifact_pattern" consistently instead of sometimes "artifact"
---
 reprotest/__init__.py | 14 +++++++-------
 reprotest/presets.py  | 18 +++++++++---------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/reprotest/__init__.py b/reprotest/__init__.py
index 62ed0e2..4fe2234 100644
--- a/reprotest/__init__.py
+++ b/reprotest/__init__.py
@@ -656,7 +656,7 @@ def cli_parser():
         'treated as a source_root, else as a build_command. Otherwise, if one '
         'of -c or -s is given, then this is treated as the other one. If both '
         'are given, then this is a command-line syntax error and we exit code 2.'),
-    parser.add_argument('artifact', default=None, nargs='?',
+    parser.add_argument('artifact_pattern', default=None, nargs='?',
         help='Build artifact to test for reproducibility. May be a shell '
              'pattern such as "*.deb *.changes".'),
     parser.add_argument('virtual_server_args', default=None, nargs='*',
@@ -814,13 +814,13 @@ def run(argv, check):
             sys.exit(2)
         elif first_arg == "auto":
             build_command = first_arg
-            if parsed_args.artifact:
+            if parsed_args.artifact_pattern:
                 logging.warn("old CLI form `reprotest auto <source_root>` detected, "
-                    "setting source_root to the second argument: %s", parsed_args.artifact)
+                    "setting source_root to the second argument: %s", parsed_args.artifact_pattern)
                 logging.warn("to avoid this warning, use instead `reprotest <source_root>` "
                     "or (if really necessary) `reprotest -s <source_root> auto <artifact>`")
-                source_root = parsed_args.artifact
-                parsed_args.artifact = None
+                source_root = parsed_args.artifact_pattern
+                parsed_args.artifact_pattern = None
         elif os.path.exists(first_arg):
             source_root = first_arg
         else:
@@ -830,7 +830,7 @@ def run(argv, check):
 
     # Args that might be affected by presets
     virtual_server_args = parsed_args.virtual_server_args
-    artifact_pattern = parsed_args.artifact
+    artifact_pattern = parsed_args.artifact_pattern
     testbed_pre = parsed_args.testbed_pre
     testbed_init = parsed_args.testbed_init
     diffoscope_args = parsed_args.diffoscope_arg
@@ -842,7 +842,7 @@ def run(argv, check):
         values = eval(auto_preset_expr, {'_': values}, {})
         logging.info("preset auto-selected: %r", values)
         build_command = values.build_command
-        artifact_pattern = artifact_pattern or values.artifact
+        artifact_pattern = artifact_pattern or values.artifact_pattern
         testbed_pre = testbed_pre or values.testbed_pre
         testbed_init = testbed_init or values.testbed_init
         if diffoscope_args is not None:
diff --git a/reprotest/presets.py b/reprotest/presets.py
index a3f5fdc..76c3e25 100644
--- a/reprotest/presets.py
+++ b/reprotest/presets.py
@@ -13,29 +13,29 @@ class AttributeFunctor(collections.namedtuple('_AttributeFunctor', 'x f')):
 
 
 class ReprotestPreset(collections.namedtuple('_ReprotestPreset',
-    'build_command artifact testbed_pre testbed_init diffoscope_args')):
+    'build_command artifact_pattern testbed_pre testbed_init diffoscope_args')):
     """Named-tuple representing a reprotest command preset.
 
     You can manipulate it like this:
 
     >>> ReprotestPreset(None, None, None, None)
-    ReprotestPreset(build_command=None, artifact=None, testbed_pre=None, testbed_init=None)
+    ReprotestPreset(build_command=None, artifact_pattern=None, testbed_pre=None, testbed_init=None)
 
     >>> _.set.build_command("etc")
-    ReprotestPreset(build_command='etc', artifact=None, testbed_pre=None, testbed_init=None)
+    ReprotestPreset(build_command='etc', artifact_pattern=None, testbed_pre=None, testbed_init=None)
 
     >>> _.append.build_command("; etc2")
-    ReprotestPreset(build_command='etc; etc2', artifact=None, testbed_pre=None, testbed_init=None)
+    ReprotestPreset(build_command='etc; etc2', artifact_pattern=None, testbed_pre=None, testbed_init=None)
 
     >>> _.prepend.build_command("setup; ")
-    ReprotestPreset(build_command='setup; etc; etc2', artifact=None, testbed_pre=None, testbed_init=None)
+    ReprotestPreset(build_command='setup; etc; etc2', artifact_pattern=None, testbed_pre=None, testbed_init=None)
 
     >>> _.set.build_command("dpkg-buildpackage --no-sign -b")
-    ReprotestPreset(build_command='dpkg-buildpackage --no-sign -b', artifact=None, testbed_pre=None, testbed_init=None)
+    ReprotestPreset(build_command='dpkg-buildpackage --no-sign -b', artifact_pattern=None, testbed_pre=None, testbed_init=None)
 
     >>> _.str_replace.build_command(
     ...    "dpkg-buildpackage", "DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -Pnocheck")
-    ReprotestPreset(build_command='DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -Pnocheck --no-sign -b', artifact=None, testbed_pre=None, testbed_init=None)
+    ReprotestPreset(build_command='DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -Pnocheck --no-sign -b', artifact_pattern=None, testbed_pre=None, testbed_init=None)
     """
 
     @property
@@ -58,7 +58,7 @@ class ReprotestPreset(collections.namedtuple('_ReprotestPreset',
 
 PRESET_DEB_DIR = ReprotestPreset(
     build_command = 'dpkg-buildpackage --no-sign -b',
-    artifact = '../*.deb',
+    artifact_pattern = '../*.deb',
     testbed_pre = None,
     testbed_init = None,
     diffoscope_args = ["--exclude-directory-metadata"],
@@ -75,7 +75,7 @@ def preset_deb_schroot(preset):
 def preset_deb_dsc(fn):
     return PRESET_DEB_DIR.prepend.build_command(
             'dpkg-source -x "%s" build && cd build && ' % fn
-        ).set.artifact("*.deb")
+        ).set.artifact_pattern("*.deb")
 
 def get_presets(buildfile, virtual_server):
     fn = os.path.basename(buildfile)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/reprotest.git