From: Daira Hopwood <daira@jacaranda.org>
Date: Thu, 5 Sep 2013 17:10:05 +0000 (+0100)
Subject: Sat Mar 31 00:41:19 BST 2012  Peter Le Bek <peter@hyperplex.net>
X-Git-Url: https://git.rkrishnan.org/pf/content/statistics?a=commitdiff_plain;h=15a4699d7a62363b01c1b43914f7ebae9397fe71;p=tahoe-lafs%2Ftahoe-lafs.git

Sat Mar 31 00:41:19 BST 2012  Peter Le Bek <peter@hyperplex.net>
  * fix ftpd mtime retrieval
---

diff --git a/src/allmydata/frontends/ftpd.py b/src/allmydata/frontends/ftpd.py
index fde72d7f..4ccb0919 100644
--- a/src/allmydata/frontends/ftpd.py
+++ b/src/allmydata/frontends/ftpd.py
@@ -201,7 +201,11 @@ class Handler:
             elif key == "hardlinks":
                 value = 1
             elif key == "modified":
-                value = metadata.get("mtime", 0)
+                # follow sftpd convention (i.e. linkmotime in preference to mtime)
+                if "linkmotime" in metadata.get("tahoe", {}):
+                    value = metadata["tahoe"]["linkmotime"]
+                else:
+                    value = metadata.get("mtime", 0)
             elif key == "owner":
                 value = self.username
             elif key == "group":