summaryrefslogtreecommitdiff
path: root/update_stdlib.sh
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2014-06-16 07:50:13 -0700
committerGuido van Rossum <guido@python.org>2014-06-16 07:50:13 -0700
commit2c6eac68d2d8fe83ad73aa203a5cefac7d285179 (patch)
tree27f29e433f23d3b347a541bb923cacfde3722d20 /update_stdlib.sh
parent8db5cb2096b2c48a3d2f47283a7eeb876848abd6 (diff)
downloadtrollius-2c6eac68d2d8fe83ad73aa203a5cefac7d285179.tar.gz
Do not offer to copy selectors.py to/from 3.4 CPython branch in update script.
Diffstat (limited to 'update_stdlib.sh')
-rwxr-xr-xupdate_stdlib.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/update_stdlib.sh b/update_stdlib.sh
index 9e05465..bb6251a 100755
--- a/update_stdlib.sh
+++ b/update_stdlib.sh
@@ -42,7 +42,12 @@ for i in `(cd asyncio && ls *.py)`
do
if [ $i == selectors.py ]
then
- maybe_copy asyncio/$i Lib/$i
+ if [ "`(cd $CPYTHON; hg branch)`" == "3.4" ]
+ then
+ echo "Destination is 3.4 branch -- ignoring selectors.py"
+ else
+ maybe_copy asyncio/$i Lib/$i
+ fi
else
maybe_copy asyncio/$i Lib/asyncio/$i
fi