[reprotest] 04/08: Fix auto-presets in the case of a file in the current directory

[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 0aa71d00a066d0edac4f705853e4b771e136011f
Author: Ximin Luo <infinity0 at debian.org>
Date:   Thu Dec 1 19:51:49 2016 +0100

    Fix auto-presets in the case of a file in the current directory
---
 debian/changelog      | 1 +
 reprotest/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0421733..8ecf660 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ reprotest (0.5) UNRELEASED; urgency=medium
 
   * Stop advertising variations that we're not actually varying.
     That is: domain_host, shell, user_group.
+  * Fix auto-presets in the case of a file in the current directory.
 
  -- Ximin Luo <infinity0 at debian.org>  Thu, 01 Dec 2016 19:31:55 +0100
 
diff --git a/reprotest/__init__.py b/reprotest/__init__.py
index 11b5c16..c169a85 100644
--- a/reprotest/__init__.py
+++ b/reprotest/__init__.py
@@ -624,7 +624,7 @@ def main():
     testbed_init = command_line_options.get("testbed_init")
 
     if build_command == 'auto':
-        source_root = os.path.dirname(artifact) if os.path.isfile(artifact) else artifact
+        source_root = os.path.normpath(os.path.dirname(artifact)) if os.path.isfile(artifact) else artifact
         auto_preset_expr = command_line_options.get("auto_preset_expr")
         values = presets.get_presets(artifact, virtual_server_args[0])
         values = eval(auto_preset_expr, {'_':values}, {})

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