Merge branch 'master' into remove-recipe-json

conda · Feb 23, 2016 · ebdfd9d · ebdfd9d
2 parents efcd26c + f416399
commit ebdfd9d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/conda_build/cran.py b/conda_build/cran.py
@@ -571,7 +571,7 @@ def main(args, parser):
         name = d['packagename']
 
         #Normalize the metadata values
-        d = {k:unicodedata.normalize("NFKD", compat.text_type(v)).encode('ascii', 'ignore') for k, v in d.iteritems()}
+        d = {k:unicodedata.normalize("NFKD", compat.text_type(v)).encode('ascii', 'ignore') for k, v in d.items()}
 
         makedirs(join(output_dir, name))
         print("Writing recipe for %s" % package.lower())

diff --git a/conda_build/environ.py b/conda_build/environ.py
@@ -173,8 +173,9 @@ def get_dict(m=None, prefix=None):
         d['LIBRARY_BIN'] = join(d['LIBRARY_PREFIX'], 'bin')
         d['LIBRARY_INC'] = join(d['LIBRARY_PREFIX'], 'include')
         d['LIBRARY_LIB'] = join(d['LIBRARY_PREFIX'], 'lib')
-        # This probably should be done more generally
-        d['CYGWIN_PREFIX'] = prefix.replace('\\', '/').replace('C:', '/cygdrive/c')
+
+        drive, tail = prefix.split(':')
+        d['CYGWIN_PREFIX'] = ''.join(['/cygdrive/', drive.lower(), tail.replace('\\', '/')])
 
         d['R'] = join(prefix, 'Scripts', 'R.exe')
     else:                               # -------- Unix