summaryrefslogtreecommitdiffstats
path: root/build/mixxx.py
diff options
context:
space:
mode:
authorRJ Skerry-Ryan <rryan@mixxx.org>2018-10-16 16:46:52 -0700
committerRJ Skerry-Ryan <rryan@mixxx.org>2018-10-16 16:46:52 -0700
commit931f8e6a11c3ed65e3b941f4d97ee3fc8f72aad6 (patch)
tree3437416af1cc0c72e55964479690ac3b6d021984 /build/mixxx.py
parente15e8766eb9d9424cbbc1e4c3e92216d5602f097 (diff)
parenta37011cee64533683baf0089e5bfa18374001e6f (diff)
Merge branch '2.2'
Diffstat (limited to 'build/mixxx.py')
-rw-r--r--build/mixxx.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/mixxx.py b/build/mixxx.py
index 9025136d68..8542b2bbcf 100644
--- a/build/mixxx.py
+++ b/build/mixxx.py
@@ -600,8 +600,8 @@ class MixxxBuild(object):
'move or delete it.' % sconsign_file)
print("shutil.copy %s -> %s" % (old_virtual_sconsign_file, sconsign_file))
shutil.copy(old_virtual_sconsign_file, sconsign_file)
- if os.path.isfile(old_virtual_sconf_temp_dir):
- if os.path.isfile(sconf_temp_dir):
+ if os.path.isdir(old_virtual_sconf_temp_dir):
+ if os.path.isdir(sconf_temp_dir):
raise Exception('%s exists without a .sconsign.branch file so '
'build virtualization cannot continue. Please '
'move or delete it.' % sconf_temp_dir)