Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

solved problem when using -u in a non interactive shell #922

Merged
merged 2 commits into from
Nov 19, 2018
Merged

solved problem when using -u in a non interactive shell #922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03a997e
solved problem when using -u in a non interactive shell
allan-simon May 3, 2016
5302b83
run ./bin/rebuild-script.py
allan-simon May 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 14 additions & 14 deletions src/virtualenv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2081,20 +2081,20 @@ def convert(s):
# file activate.sh
ACTIVATE_SH = convert(
"""
eJytVd9v2kAMfs9fYQLq2m4MscdNVKMqEkgtVIQxbeuUHolpTgsXdHehpT/+9/mSEBJS2MOaB0ji
z77P9menDpOAK5jzEGERKw0zhFihD/dcB2CrKJYewoyLFvM0XzGNNpzOZbSAGVPBqVWHdRSDx4SI
NMhYANfgc4meDteW5ePGC45P4MkCumKhUENzDsu1H3lw1vJx1RJxGMKns6O2lWDqINGgotAHFCsu
I7FAoWHFJGezEFWGqsEvaD5C42naHb93X+A3+elYCgVaxgh8DmQAys9HL2SS0mIaWBgm7mTN/O3G
kzu6vHCng/HkW/fSve5O+hTOpnhfQAcoEry5jKVjNypoO0fgwzKSOgHm79KUK06Jfc7/RebHpD8a
9kdXvT2UcnuFWG6p0stNB0mWUUQ1q3uiGRVEMfXHR03dTuQATPjwqIIPcB9wL4CArRAY/ZHJixYL
Y9YBtcAoLQtFevOoI9QaHcEdMSAB0d08kuZhyUiSmav6CPCdVBnFOjNrLu6yMCWgKRA0TInBC5i4
QwX3JG/mm581GKnSsSSxJTFHf9MAKr8w5T/vOv1mUurn5/zlT6fvTntjZzAaNl9rQ5JkU5KIc0GX
inagwU57T2eddqWlTrvaS6d9sImZeUMkhWysveF0m37NcGub9Dpgi0j4qGiOzATjDr06OBjOYQOo
7RBoGtNm9Denv1i0LVI7lxJDXLHSSBeWRflsyyqw7diuW3h0XdvK6lBMyaoMG1UyHdTsoYBuue75
YOgOu1c91/2cwYpznPPeDoQpGL2xSm09NKp7BsvQ2hnT3aMs07lUnskpxewvBk73/LLnXo9HV9eT
ijB3hWBO2ygoiWg/bKuZxqCCQq0DD3vkWIVvI2KosIw+vqW1gIItEG5KJb+xb09g65ktwYKgTc51
uGJ/EFQs0ayEWLCQM5V9N4g+1+8UbXOJzF8bqhKtIqIwicWvzNFROZJlpfD8A7Vc044R0FxkcezG
VzsV75usvTdYef+57v5n1b225qhXfwEmxHEs
eJytVdtu2kAQffdXDAalSVqK6GMrohIFCaQEIkyp2qZyFnuIVzVrtLsmIZd/76xtjI0DfWj8ALbn
smfmnBnXYRJwBXMeIixipWGGECv04Z7rAGwVxdJDmHHRYp7mK6bRhtO5jBYwYyo4teqwjmLwmBCR
BhkL4Bp8LtHT4dqyfNxEwfEJPFlAVywUamjOYbn2Iw/OWj6uWiIOQ/h0dtS2Ep86SDReUegDihWX
kVig0LBikrNZiCrzqsEvaD5C42naHb93X+A3xelYCgVaxgh8DmQAqs9HL2SSymIaWBgm4WTN4u3G
kzu6vHCng/HkW/fSve5O+pTOpnxfQAcoEn9zGUvHblS87dwDH5aR1Ilj/i4tuRKU2Of8X2B+TPqj
YX901dsDKbdXgOWWKrzcdBBk2YugZn1PNKOCKCZ+fNTEdiIHYMKHRxV8gPuAewEEbIXA6I9MXrRY
GLMOiAKjtCwV6c0jRogaHcEdISAB0d08kuZhyUiSWaj6CPCdVBnFOjNrLu6yNCVH0yBomBaDFzBx
hwruSd7MNz9rMFKlY0liS0KO/oYAar8w7T/vOv1m0urn5/zlT6fvTntjZzAaNl+jISmyKUnEuaBL
TTtAsNPew6zTrlDqtKtcOu2DJGbmDZDUZWPtDafb8msGW9uU1wFbRMJHRXNkJhh34NXBwXAOG4fa
DoCmMW1Gf3P6i0XbIrVzKTHEFSuNdGFZlM+2rALaju26hUfXta2sD8WSrMqwUSfTQc0eCt4t1z0f
DN1h96rnup8zt+Ic57i3A2EaRm+sEq2HRnXPYBlYO2O6e5RlmEvlmZxSrP5i4HTPL3vu9Xh0dT2p
CHNXCB0D0jEMb0m3H7YNTdNQT6HWgYc9iqy6l5JiqLAccHxLywEFWyDclBp/Y9+eQCk424YFZZvi
63DF/iCoWKLZDbFgIWcq+4BQEVy/U7TWJTJ/bQBLtIoehZEsfm6OjsqZLCt1z79UyzUtGwHNRZbH
bny1UxW/yf57g933n3vvf3bea/uOuPoLeGd0mw==
"""
)

Expand Down
6 changes: 3 additions & 3 deletions virtualenv_embedded/activate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ if ! [ -z "${PYTHONHOME+_}" ] ; then
fi

if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT-}" ] ; then
_OLD_VIRTUAL_PS1="$PS1"
_OLD_VIRTUAL_PS1="${PS1-}"
if [ "x__VIRTUAL_PROMPT__" != x ] ; then
PS1="__VIRTUAL_PROMPT__$PS1"
PS1="__VIRTUAL_PROMPT__${PS1-}"
else
PS1="(`basename \"$VIRTUAL_ENV\"`) $PS1"
PS1="(`basename \"$VIRTUAL_ENV\"`) ${PS1-}"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to run bin/rebuild-script.py and commit virtualenv.py to make these changes take effect.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done :)

fi
export PS1
fi
Expand Down