[JOIN] Fix os.path.samefile() check for win32

[rarslave2.git] / PAR2Set / Join.py

diff --git a/PAR2Set/Join.py b/PAR2Set/Join.py
index 34c4996..61a1c42 100644 (file)
--- 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.
                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)
                        return rsutil.common.SUCCESS
 
                cmd = NOEXTRACT_CMD % (file, todir)