diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2016-06-15 15:32:59 +0300 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2016-06-15 15:32:59 +0300 |
| commit | 5a0b92794141777db912a704fe91058784ad4697 (patch) | |
| tree | 8381cbb736b1ddcb69ded6018dc0ec03242167fc | |
| parent | cbceff5a46cd799be57d4deb1441df5377710e45 (diff) | |
Fix check for file already in release area
Fix the check if an uploaded file already exists in the release area.
This was broken by noarch changes.
| -rw-r--r-- | calm/uploads.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/calm/uploads.py b/calm/uploads.py index 6759f69..10b5514 100644 --- a/calm/uploads.py +++ b/calm/uploads.py @@ -49,7 +49,6 @@ ScanResult = namedtuple('ScanResult', 'error,packages,to_relarea,to_vault,remove def scan(m, all_packages, arch, args): basedir = os.path.join(m.homedir(), arch) - releasedir = os.path.join(args.rel_area, arch) packages = defaultdict(package.Package) move = defaultdict(list) @@ -183,7 +182,7 @@ def scan(m, all_packages, arch, args): continue # does file already exist in release area? - dest = os.path.join(releasedir, relpath, f) + dest = os.path.join(args.rel_area, relpath, f) if os.path.isfile(dest): if f != 'setup.hint': if filecmp.cmp(dest, fn, shallow=False): |