[pypy-commit] pypy py3.6: merge default into py3.6

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: py3.6
Changeset: r98258:73547ce83824
Date: 2019-12-08 16:33 +0200
http://bitbucket.org/pypy/pypy/changeset/73547ce83824/

Log:	merge default into py3.6

diff --git a/pypy/tool/release/package.py b/pypy/tool/release/package.py
--- a/pypy/tool/release/package.py
+++ b/pypy/tool/release/package.py
@@ -64,8 +64,6 @@
     name = options.name
     if not name:
         name = 'pypy-nightly'
-    if options.make_portable and 'portable' not in name:
-        name += '-portable'
     assert '/' not in name
     rename_pypy_c = options.pypy_c
     override_pypy_c = options.override_pypy_c