Merge branch 'master' of github.com:micropython/micropython

dpgeorge · dpgeorge · commit 3bb8663282fd · 2014-04-07T00:54:53.000+01:00
diff --git a/tests/basics/set_union.py b/tests/basics/set_union.py
@@ -1 +1 @@
-print({1}.union({2}))
+print(sorted({1}.union({2})))
diff --git a/tools/pip-micropython b/tools/pip-micropython
@@ -6,6 +6,12 @@
 # ports (if PIP_MICROPY_DEST environment var is set).
 #
 
+if [ "$1" != "install" ]; then
+    echo "Only install command is supported currently"
+    exit 1
+fi
+shift
+
 if [ -n "$PIP_MICROPY_DEST" ]; then
     dest="$PIP_MICROPY_DEST"
     echo "Destination snapshot directory: $dest"
