← Back to branch summary

~brian-murray/merge-o-matic/linkify-uploader

« back to all changes in this revision

Viewing changes to produce-merges.py

  • Committer: Colin Watson
  • Date: 2012-11-09 13:43:55 UTC
  • Revision ID: cjwatson@canonical.com-20121109134355-eyd534jomkmkxayh
produce-merges.py: unpack base_source in the context of right_distro, not left_distro, since that's where it was originally uploaded

Show diffs side-by-side

added added

removed removed

Lines of Context:
produce-merges.py
183
183
 
184
184
    try:
185
185
        left_dir = unpack_source(left_distro, left_source)
186
 
        base_dir = unpack_source(left_distro, base_source)
 
186
        base_dir = unpack_source(right_distro, base_source)
187
187
        right_dir = unpack_source(right_distro, right_source)
188
188
 
189
189
        merged_dir = work_dir(package, merged_version)