Merge ~chad.smith/cloud-init:cleanup/make-clean-cleans-docs into cloud-init:master

Proposed by Chad Smith
Status: Merged
Approved by: Dan Watkins
Approved revision: 70b087dc1602f76471159734a6619806aa4156d7
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~chad.smith/cloud-init:cleanup/make-clean-cleans-docs
Merge into: cloud-init:master
Diff against target: 16 lines (+2/-1)
1 file modified
Makefile (+2/-1)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Dan Watkins Approve
Review via email:

Commit message

tools: make clean now cleans the dev directory, not the system

Remove pyc files, .tox directories and docs during make clean.

To post a comment you must log in.
Revision history for this message
Dan Watkins (oddbloke) wrote :


review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:70b087dc1602f76471159734a6619806aa4156d7
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index 2c6d0c8..315e6b4 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -80,9 +80,10 @@ config/cloud.cfg:
7 clean_pyc:
8 @find . -type f -name "*.pyc" -delete
9+ @find . -type d -name __pycache__ -delete
11 clean: clean_pyc
12- rm -rf /var/log/cloud-init.log /var/lib/cloud/
13+ rm -rf doc/rtd_html .tox .coverage
15 yaml:
16 @$(PYVER) $(CWD)/tools/ $(YAML_FILES)


People subscribed via source and target branches