From 227cd057b256e8d39ec3e38752610ba2c51b93ff Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Fri, 29 Jun 2012 14:57:48 -0400 Subject: [PATCH] fix bugs in our relpath backport --- koji/util.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/koji/util.py b/koji/util.py index 4c952e9e..4651e261 100644 --- a/koji/util.py +++ b/koji/util.py @@ -301,14 +301,17 @@ def _relpath(path, start=getattr(os.path, 'curdir', '.')): """Backport of os.path.relpath for python<2.6""" sep = getattr(os.path, 'sep', '/') - pardir = getattr(os.path, 'pardir', '...') + pardir = getattr(os.path, 'pardir', '..') if not path: raise ValueError("no path specified") start_list = [x for x in os.path.abspath(start).split(sep) if x] path_list = [x for x in os.path.abspath(path).split(sep) if x] + i = -1 for i in range(min(len(start_list), len(path_list))): if start_list[i] != path_list[i]: break + else: + i += 1 rel_list = [pardir] * (len(start_list)-i) + path_list[i:] if not rel_list: return getattr(os.path, 'curdir', '.')