# # # patch "BUGS" # from [9b566991f11c7de471bd3f4bb84938513891fc97] # to [7207790086725245cd08fcd0f6c71d416102ed47] # # patch "fs_sftp.py" # from [ad2c0c3e6dd787dc9b5a15b48d01650e51cbdc5d] # to [e26bfd73b32b6c99263cc2c58e4ec3051ead83ff] # ============================================================ --- BUGS 9b566991f11c7de471bd3f4bb84938513891fc97 +++ BUGS 7207790086725245cd08fcd0f6c71d416102ed47 @@ -1,10 +1,10 @@ NEW Mini-mantis (tm) ;) NEW 2. When monotone asks for db migration script goes into infinite loop. Seen on pre-0.33 database used with mtn 0.33 -NEW +RESOLVED 1. When pushing from Win32 to Unix by SFTP names with \ instead are created on SFTP site: -- /sample/ @@ -23,7 +23,6 @@ NEW Probably some "os.path.normpath()" is used somewhere. - -RESOLVED + Resolution: don't use os.path.join() when creating remote path. ============================================================ --- fs_sftp.py ad2c0c3e6dd787dc9b5a15b48d01650e51cbdc5d +++ fs_sftp.py e26bfd73b32b6c99263cc2c58e4ec3051ead83ff @@ -100,7 +100,9 @@ class SFTPReadableFS(fs.ReadableFS): self.client = self.transport.open_sftp_client() def _fname(self, filename): - return os.path.join(self.dir, filename) + fname = "%s/%s" % (self.dir, filename) + print "target name: %s" % fname + return fname def open_read(self, filename): return self.client.open(self._fname(filename), "rb")