[CalendarServer-changes] [11323] CalendarServer/trunk

source_changes at macosforge.org source_changes at macosforge.org
Thu Jun 6 17:41:33 PDT 2013


Revision: 11323
          http://trac.calendarserver.org//changeset/11323
Author:   wsanchez at apple.com
Date:     2013-06-06 17:41:33 -0700 (Thu, 06 Jun 2013)
Log Message:
-----------
Use system pyflakes if available.

Modified Paths:
--------------
    CalendarServer/trunk/pyflakes
    CalendarServer/trunk/support/build.sh

Modified: CalendarServer/trunk/pyflakes
===================================================================
--- CalendarServer/trunk/pyflakes	2013-06-06 18:13:06 UTC (rev 11322)
+++ CalendarServer/trunk/pyflakes	2013-06-07 00:41:33 UTC (rev 11323)
@@ -4,9 +4,14 @@
 set -u
 
 wd="$(cd "$(dirname "$0")" && pwd)";
-flakes="$(cd "${wd}/../pyflakes-0.6.1" && pwd)";
 
-export PYTHONPATH="${flakes}:${PYTHONPATH:-}";
+if type -P pyflakes > /dev/null; then
+    pyflakes="pyflakes";
+else
+    flakes="$(cd "${wd}/../pyflakes-0.6.1" && pwd)";
+    export PYTHONPATH="${flakes}:${PYTHONPATH:-}";
+    pyflakes="${flakes}/bin/pyflakes";
+fi;
 
 if [ $# -eq 0 ]; then
   set - calendarserver twext twisted twistedcaldav txdav contrib;
@@ -14,7 +19,7 @@
 
 tmp="$(mktemp "/tmp/pyflakes.XXXXX")";
 
-cd "${wd}" && "${flakes}/bin/pyflakes" "$@" | sed                         \
+cd "${wd}" && "${pyflakes}" "$@" | sed                                    \
   -e "/'from ctypes import \\*' used; unable to detect undefined names/d" \
   -e "/redefinition of unused/d"                                          \
   -e "/^twext\\/backport/d"                                               \

Modified: CalendarServer/trunk/support/build.sh
===================================================================
--- CalendarServer/trunk/support/build.sh	2013-06-06 18:13:06 UTC (rev 11322)
+++ CalendarServer/trunk/support/build.sh	2013-06-07 00:41:33 UTC (rev 11323)
@@ -811,12 +811,16 @@
     "SQLParse" "${n}" "${p}" \
     "http://python-sqlparse.googlecode.com/files/${p}.tar.gz";
 
-  local v="0.6.1";
-  local n="pyflakes";
-  local p="${n}-${v}";
-  py_dependency -o -v "${v}" -m "00debd2280b962e915dfee552a675915" \
-    "Pyflakes" "${n}" "${p}" \
-    "${pypi}/p/${n}/${p}.tar.gz";
+  if type -P pyflakes > /dev/null; then
+    using_system "PyFlakes";
+  else
+    local v="0.6.1";
+    local n="pyflakes";
+    local p="${n}-${v}";
+    py_dependency -o -v "${v}" -m "00debd2280b962e915dfee552a675915" \
+      "Pyflakes" "${n}" "${p}" \
+      "${pypi}/p/${n}/${p}.tar.gz";
+  fi;
  
   py_dependency -o -r HEAD \
     "CalDAVClientLibrary" "caldavclientlibrary" "CalDAVClientLibrary" \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130606/8288e352/attachment.html>


More information about the calendarserver-changes mailing list