Merge lp://staging/~gary/launchpad/bug562828 into lp://staging/launchpad

Proposed by Gary Poster
Status: Merged
Approved by: Aaron Bentley
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp://staging/~gary/launchpad/bug562828
Merge into: lp://staging/launchpad
Diff against target: 170 lines (+129/-2)
2 files modified
lib/canonical/librarian/ftests/test_gc.py (+31/-0)
lib/canonical/librarian/librariangc.py (+98/-2)
To merge this branch: bzr merge lp://staging/~gary/launchpad/bug562828
Reviewer Review Type Date Requested Status
Aaron Bentley (community) Approve
Review via email: mp+24044@code.staging.launchpad.net

Commit message

Switch lib/canonical/librarian/librariangc.py to using a copy of Python 2.6's os.walk in order to support symlinks in our librarian file directory.

Description of the change

This switches lib/canonical/librarian/librariangc.py to using a copy of Python 2.6's os.walk per the discussion of bug 562828, in order to support symlinks in our librarian file directory.

To post a comment you must log in.
Revision history for this message
Gary Poster (gary) wrote :

Note that _walk in the diff is an almost-pure copy and paste from Python 2.6's os.walk. The only difference is that listdir became os.listdir.

Revision history for this message
Gary Poster (gary) wrote :

Note that I initialized content_id because it was failing when I did a "does my test fail without my fix" test. I don't know if it is a "real" problem but it seemed reasonable to do.

Revision history for this message
Aaron Bentley (abentley) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.