Skip to content
Permalink
Browse files

Kill --agree-dev-preview

  • Loading branch information
bmw committed Dec 2, 2015
1 parent 87d3ceb commit 462139fca9d7358df0ca0f24085ae0afddd3cbb9
Showing with 7 additions and 26 deletions.
  1. +0 −1 DISCLAIMER
  2. +1 −1 Dockerfile-dev
  3. +0 −1 MANIFEST.in
  4. +0 −1 examples/dev-cli.ini
  5. +0 −5 letsencrypt/DISCLAIMER
  6. +2 −11 letsencrypt/cli.py
  7. +4 −5 letsencrypt/tests/cli_test.py
  8. +0 −1 tests/integration/_common.sh

This file was deleted.

@@ -33,7 +33,7 @@ RUN /opt/letsencrypt/src/ubuntu.sh && \
# Dockerfile we make sure we cache as much as possible

# py26reqs.txt not installed!
COPY setup.py README.rst CHANGES.rst MANIFEST.in DISCLAIMER linter_plugin.py tox.cover.sh tox.ini pep8.travis.sh .pep8 .pylintrc /opt/letsencrypt/src/
COPY setup.py README.rst CHANGES.rst MANIFEST.in linter_plugin.py tox.cover.sh tox.ini pep8.travis.sh .pep8 .pylintrc /opt/letsencrypt/src/

# all above files are necessary for setup.py, however, package source
# code directory has to be copied separately to a subdirectory...
@@ -4,7 +4,6 @@ include CHANGES.rst
include CONTRIBUTING.md
include LICENSE.txt
include linter_plugin.py
include letsencrypt/DISCLAIMER
recursive-include docs *
recursive-include examples *
recursive-include letsencrypt/tests/testdata *
@@ -8,7 +8,6 @@ email = foo@example.com
domains = example.com

text = True
agree-dev-preview = True
agree-tos = True
debug = True
# Unfortunately, it's not possible to specify "verbose" multiple times

This file was deleted.

@@ -6,7 +6,6 @@
import logging
import logging.handlers
import os
import pkg_resources
import sys
import time
import traceback
@@ -894,9 +893,6 @@ def prepare_and_parse_args(plugins, args):
"automation", "--renew-by-default", action="store_true",
help="Select renewal by default when domains are a superset of a "
"a previously attained cert")
helpful.add(
"automation", "--agree-dev-preview", action="store_true",
help="Agree to the Let's Encrypt Developer Preview Disclaimer")
helpful.add(
"automation", "--agree-tos", dest="tos", action="store_true",
help="Agree to the Let's Encrypt Subscriber Agreement")
@@ -961,6 +957,8 @@ def prepare_and_parse_args(plugins, args):
help="Require that all configuration files are owned by the current "
"user; only needed if your config is somewhere unsafe like /tmp/")

helpful.add_deprecated_argument("--agree-dev-preview", 0)

_create_subparsers(helpful)
_paths_parser(helpful)
# _plugins_parsing should be the last thing to act upon the main
@@ -1218,13 +1216,6 @@ def main(cli_args=sys.argv[1:]):
zope.component.provideUtility(report)
atexit.register(report.atexit_print_messages)

# TODO: remove developer preview prompt for the launch
if not config.agree_dev_preview:
disclaimer = pkg_resources.resource_string("letsencrypt", "DISCLAIMER")
if not zope.component.getUtility(interfaces.IDisplay).yesno(
disclaimer, "Agree", "Cancel"):
raise errors.Error("Must agree to TOS")

if not os.geteuid() == 0:
logger.warning(
"Root (sudo) is required to run most of letsencrypt functionality.")
@@ -39,9 +39,9 @@ def setUp(self):
self.config_dir = os.path.join(self.tmp_dir, 'config')
self.work_dir = os.path.join(self.tmp_dir, 'work')
self.logs_dir = os.path.join(self.tmp_dir, 'logs')
self.standard_args = ['--text', '--config-dir', self.config_dir,
'--work-dir', self.work_dir, '--logs-dir',
self.logs_dir, '--agree-dev-preview']
self.standard_args = ['--config-dir', self.config_dir,
'--work-dir', self.work_dir,
'--logs-dir', self.logs_dir, '--text']

def tearDown(self):
shutil.rmtree(self.tmp_dir)
@@ -180,8 +180,7 @@ def test_installer_selection(self, mock_display_ops, _rec):
def test_configurator_selection(self, mock_exe_exists):
mock_exe_exists.return_value = True
real_plugins = disco.PluginsRegistry.find_all()
args = ['--agree-dev-preview', '--apache',
'--authenticator', 'standalone']
args = ['--apache', '--authenticator', 'standalone']

# This needed two calls to find_all(), which we're avoiding for now
# because of possible side effects:
@@ -21,7 +21,6 @@ letsencrypt_test () {
$store_flags \
--text \
--no-redirect \
--agree-dev-preview \
--agree-tos \
--register-unsafely-without-email \
--renew-by-default \

0 comments on commit 462139f

Please sign in to comment.
You can’t perform that action at this time.