X-Git-Url: https://www.irasnyder.com/gitweb/?p=rarslave2.git;a=blobdiff_plain;f=PAR2Set%2FJoin.py;fp=PAR2Set%2FJoin.py;h=61a1c42479f364dc355f86683b1b7d25d4c775bc;hp=34c4996c709c2ba98e6f1b68ef1d8f2693b9abfc;hb=063e02e2f4395d547d548051d525c0e39f060baf;hpb=663cfde9556accb7d3e24227dec20e2bc84e431d diff --git a/PAR2Set/Join.py b/PAR2Set/Join.py index 34c4996..61a1c42 100644 --- a/PAR2Set/Join.py +++ b/PAR2Set/Join.py @@ -126,7 +126,9 @@ class Join (PAR2Set.Base.Base): NOEXTRACT_CMD = rsutil.common.config_get_value ('commands', 'noextract') # Make sure that both files are not the same file. If they are, don't run at all. - if os.path.samefile (file, os.path.join (todir, file)): + # NOTE: os.path.samefile() doesn't exist on win32, so we can't use it. + if rsutil.common.full_abspath (file) == \ + rsutil.common.full_abspath (os.path.join (todir, file)): return rsutil.common.SUCCESS cmd = NOEXTRACT_CMD % (file, todir)