diff options
| author | RJ Skerry-Ryan <rryan@mixxx.org> | 2018-10-16 16:46:22 -0700 |
|---|---|---|
| committer | RJ Skerry-Ryan <rryan@mixxx.org> | 2018-10-16 16:46:22 -0700 |
| commit | a37011cee64533683baf0089e5bfa18374001e6f (patch) | |
| tree | d6bd6c21204d13ddcf6aeedb062bef7695c5e013 /build/mixxx.py | |
| parent | 5754ae176b31562b5484bef0acb1df91103da61a (diff) | |
| parent | d3646d5750cab485d1a440323ee36eb276758d26 (diff) | |
Merge branch '2.1' into 2.2
Diffstat (limited to 'build/mixxx.py')
| -rw-r--r-- | build/mixxx.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/mixxx.py b/build/mixxx.py index b06c36a864..8bc37fd927 100644 --- a/build/mixxx.py +++ b/build/mixxx.py @@ -611,8 +611,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) |