Advertisement
fsantiago07044

git diff

Feb 11th, 2016
1,278
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 3.22 KB | None | 0 0
  1. diff --git a/letsencrypt-auto-source/letsencrypt-auto b/letsencrypt-auto-source/letsencrypt-auto
  2. index 24b62e3..e081250 100755
  3. --- a/letsencrypt-auto-source/letsencrypt-auto
  4. +++ b/letsencrypt-auto-source/letsencrypt-auto
  5. @@ -19,7 +19,7 @@ XDG_DATA_HOME=${XDG_DATA_HOME:-~/.local/share}
  6. VENV_NAME="letsencrypt"
  7. VENV_PATH=${VENV_PATH:-"$XDG_DATA_HOME/$VENV_NAME"}
  8. VENV_BIN=${VENV_PATH}/bin
  9. -LE_AUTO_VERSION="0.4.0.dev0"
  10. +LE_AUTO_VERSION="0.3.0"
  11.  
  12. # This script takes the same arguments as the main letsencrypt program, but it
  13. # additionally responds to --verbose (more output) and --debug (allow support
  14. @@ -105,7 +105,9 @@ DeterminePythonVersion() {
  15. fi
  16.  
  17. PYVER=`"$LE_PYTHON" --version 2>&1 | cut -d" " -f 2 | cut -d. -f1,2 | sed 's/\.//'`
  18. - if [ $PYVER -lt 26 ]; then
  19. + if [ $PYVER -eq 26 ]; then
  20. + ExperimentalBootstrap "Python 2.6"
  21. + elif [ $PYVER -lt 26 ]; then
  22. echo "You have an ancient version of Python entombed in your operating system..."
  23. echo "This isn't going to work; you'll need at least version 2.6."
  24. exit 1
  25. @@ -290,7 +292,7 @@ BootstrapArchCommon() {
  26. #
  27. # "python-virtualenv" is Python3, but "python2-virtualenv" provides
  28. # only "virtualenv2" binary, not "virtualenv" necessary in
  29. - # ./tools/_venv_common.sh
  30. + # ./bootstrap/dev/_common_venv.sh
  31.  
  32. deps="
  33. python2
  34. @@ -372,7 +374,7 @@ Bootstrap() {
  35. elif [ -f /etc/redhat-release ]; then
  36. echo "Bootstrapping dependencies for RedHat-based OSes..."
  37. BootstrapRpmCommon
  38. - elif [ -f /etc/os-release ] && `grep -q openSUSE /etc/os-release` ; then
  39. + elif `grep -q openSUSE /etc/os-release` ; then
  40. echo "Bootstrapping dependencies for openSUSE-based OSes..."
  41. BootstrapSuseCommon
  42. elif [ -f /etc/arch-release ]; then
  43. @@ -436,8 +438,8 @@ if [ "$NO_SELF_UPGRADE" = 1 ]; then
  44. # -------------------------------------------------------------------------
  45. cat << "UNLIKELY_EOF" > "$TEMP_DIR/letsencrypt-auto-requirements.txt"
  46. # This is the flattened list of packages letsencrypt-auto installs. To generate
  47. -# this, do `pip install --no-cache-dir -e acme -e . -e letsencrypt-apache`, and
  48. -# then use `hashin` or a more secure method to gather the hashes.
  49. +# this, do `pip install -e acme -e . -e letsencrypt-apache`, `pip freeze`,
  50. +# and then gather the hashes.
  51.  
  52. # sha256: wxZH7baf09RlqEfqMVfTe-0flfGXYLEaR6qRwEtmYxQ
  53. # sha256: YrCJpVvh2JSc0rx-DfC9254Cj678jDIDjMhIYq791uQ
  54. @@ -506,10 +508,6 @@ idna==2.0
  55. # sha256: WjGCsyKnBlJcRigspvBk0noCz_vUSfn0dBbx3JaqcbA
  56. ipaddress==1.0.16
  57.  
  58. -# sha256: 54vpwKDfy6xxL-BPv5K5bN2ugLG4QvJCSCFMhJbwBu8
  59. -# sha256: Syb_TnEQ23butvWntkqCYjg51ZXCA47tpmLyott46Xw
  60. -linecache2==1.0.0
  61. -
  62. # sha256: 6MFV_evZxLywgQtO0BrhmHVUse4DTddTLXuP2uOKYnQ
  63. ndg-httpsclient==0.4.0
  64.  
  65. @@ -601,14 +599,6 @@ requests==2.9.1
  66. # sha256: EF-NaGFvgkjiS_DpNy7wTTzBAQTxmA9U1Xss5zpa1Wo
  67. six==1.10.0
  68.  
  69. -# sha256: glPOvsSxkJTWfMXtWvmb8duhKFKSIm6Yoxkp-HpdayM
  70. -# sha256: BazGegmYDC7P7dNCP3rgEEg57MtV_GRXc-HKoJUcMDA
  71. -traceback2==1.4.0
  72. -
  73. -# sha256: E_d9CHXbbZtDXh1PQedK1MwutuHVyCSZYJKzQw8Ii7g
  74. -# sha256: IogqDkGMKE4fcYqCKzsCKUTVPS2QjhaQsxmp0-ssBXk
  75. -unittest2==1.1.0
  76. -
  77. # sha256: aUkbUwUVfDxuDwSnAZhNaud_1yn8HJrNJQd_HfOFMms
  78. # sha256: 619wCpv8lkILBVY1r5AC02YuQ9gMP_0x8iTCW8DV9GI
  79. Werkzeug==0.11.3
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement