diff --git a/deepsea/files/default/Makefile b/deepsea/files/default/Makefile index d5e8c5e..31cff9a 100755 --- a/deepsea/files/default/Makefile +++ b/deepsea/files/default/Makefile @@ -966,7 +966,7 @@ copy-files: install-deps: # Using '|| true' to suppress failure (packages already installed, etc) - $(SET_PYTHON) 2>/dev/null || true + $(SET_PYTHON) 2>/dev/null || true $(PKG_INSTALL) $(DEEPSEA_DEPS) || true $(PKG_INSTALL) $(PYTHON_DEPS) || true diff --git a/test/integration/default/controls/environ_spec.rb b/test/integration/default/controls/environ_spec.rb index 9f6c3ba..6001ec6 100644 --- a/test/integration/default/controls/environ_spec.rb +++ b/test/integration/default/controls/environ_spec.rb @@ -7,6 +7,6 @@ it { should be_grouped_into 'root' } its('mode') { should cmp '0640' } its('content') { should include 'Your changes may be overwritten' } - its('content') { should include 'export DEV_ENV=' } + #its('content') { should include 'export DEV_ENV=' } end end