From 51baaee78f27fe6df441435f415c0e16698725d5 Mon Sep 17 00:00:00 2001 From: Ashley C Straw Date: Tue, 8 Sep 2015 10:18:50 -0400 Subject: [PATCH 1/5] Update remote.py --- plumbum/machines/remote.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plumbum/machines/remote.py b/plumbum/machines/remote.py index 6b8fa89a8..964e18e84 100644 --- a/plumbum/machines/remote.py +++ b/plumbum/machines/remote.py @@ -322,7 +322,7 @@ def _path_getgid(self, fn): stat_cmd = "stat -c '%g,%G' " if self.uname != 'Darwin' else "stat -f '%g,%Sg' " return self._session.run(stat_cmd + shquote(fn))[1].strip().split(",") def _path_stat(self, fn): - if self.uname != 'Darwin': + if self.uname not in ('Darwin', 'FreeBSD'): stat_cmd = "stat -c '%F,%f,%i,%d,%h,%u,%g,%s,%X,%Y,%Z' " else: stat_cmd = "stat -f '%HT,%Xp,%i,%d,%l,%u,%g,%z,%a,%m,%c' " From abe504fca92d267e974b66ca4b42ac97abf096ca Mon Sep 17 00:00:00 2001 From: Ashley C Straw Date: Tue, 8 Sep 2015 11:04:50 -0400 Subject: [PATCH 2/5] Update version.py --- plumbum/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plumbum/version.py b/plumbum/version.py index cf0d2a240..982c40951 100644 --- a/plumbum/version.py +++ b/plumbum/version.py @@ -1,3 +1,3 @@ -version = (1, 5, 0) +version = (1, 5, 0, r1) version_string = ".".join(map(str,version)) release_date = "2015.07.17" From 8c3f6d8fc4055b4377df3da8f2926a838ab2a3b9 Mon Sep 17 00:00:00 2001 From: Ashley C Straw Date: Tue, 8 Sep 2015 11:05:03 -0400 Subject: [PATCH 3/5] Update version.py --- plumbum/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plumbum/version.py b/plumbum/version.py index 982c40951..117669a74 100644 --- a/plumbum/version.py +++ b/plumbum/version.py @@ -1,3 +1,3 @@ -version = (1, 5, 0, r1) +version = (1, 5, 0, 'r1') version_string = ".".join(map(str,version)) release_date = "2015.07.17" From 9a0ef3d0532fb99c08855e42f321c4715d511d59 Mon Sep 17 00:00:00 2001 From: Ashley C Straw Date: Tue, 8 Sep 2015 14:44:18 -0400 Subject: [PATCH 4/5] Update version.py --- plumbum/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plumbum/version.py b/plumbum/version.py index 117669a74..cf0d2a240 100644 --- a/plumbum/version.py +++ b/plumbum/version.py @@ -1,3 +1,3 @@ -version = (1, 5, 0, 'r1') +version = (1, 5, 0) version_string = ".".join(map(str,version)) release_date = "2015.07.17" From 5ff54654cdf6d07e866a8a2c998e35f095b702a6 Mon Sep 17 00:00:00 2001 From: Ashley C Straw Date: Tue, 8 Sep 2015 15:14:52 -0400 Subject: [PATCH 5/5] Fixed 2 other instances of 'stat -c' for FreeBSD --- plumbum/machines/remote.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plumbum/machines/remote.py b/plumbum/machines/remote.py index 964e18e84..3f11e852e 100644 --- a/plumbum/machines/remote.py +++ b/plumbum/machines/remote.py @@ -316,10 +316,10 @@ def _path_glob(self, fn, pattern): return matches def _path_getuid(self, fn): - stat_cmd = "stat -c '%u,%U' " if self.uname != 'Darwin' else "stat -f '%u,%Su' " + stat_cmd = "stat -c '%u,%U' " if self.uname not in ('Darwin', 'FreeBSD') else "stat -f '%u,%Su' " return self._session.run(stat_cmd + shquote(fn))[1].strip().split(",") def _path_getgid(self, fn): - stat_cmd = "stat -c '%g,%G' " if self.uname != 'Darwin' else "stat -f '%g,%Sg' " + stat_cmd = "stat -c '%g,%G' " if self.uname not in ('Darwin', 'FreeBSD') else "stat -f '%g,%Sg' " return self._session.run(stat_cmd + shquote(fn))[1].strip().split(",") def _path_stat(self, fn): if self.uname not in ('Darwin', 'FreeBSD'):