lp:~costamagnagianfranco/merge-o-matic/merge-o-matic

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:merge-o-matic

Brian Murray: Needs Fixing on 2023-06-09

Diff: 257 lines (+28/-28)

20 files modified

check-pool.py (+1/-1)
deb/__init__.py (+1/-1)
deb/controlfile.py (+1/-1)
deb/version.py (+1/-1)
expire-pool.py (+1/-1)
generate-diffs.py (+1/-1)
generate-dpatches.py (+1/-1)
generate-patches.py (+1/-1)
manual-status.py (+4/-4)
merge-status.py (+4/-4)
momlib.py (+2/-2)
produce-merges.py (+1/-1)
publish-patches.py (+1/-1)
stats-graphs.py (+1/-1)
stats.py (+1/-1)
syndicate.py (+1/-1)
update-pool.py (+2/-2)
update-sources.py (+1/-1)
util/__init__.py (+1/-1)
util/tree.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

383. By Gianfranco Costamagna on 2023-04-18

Move M-o-M to python3

382. By Colin Watson on 2023-02-28

Fix subprocess error handling.

The old util.shell.run raised either ValueError or OSError if the
subprocess failed, but subprocess.check_call raises
subprocess.CalledProcessError.

381. By Colin Watson on 2023-02-28

produce-merges.py: Copy multiple orig component tarballs.

380. By Colin Watson on 2023-02-24

produce-merges.py: Optimize common case where LHS is unchanged from base.

This also avoids source package build errors due to unnecessary changes
introduced by PO/POT file merging where the base and LHS are identical
and so we can just take the RHS.

379. By Colin Watson on 2023-02-17

produce-merges.py: Make report text slightly more generic.

378. By Colin Watson on 2023-02-17

Remove unused deb.source.

377. By Colin Watson on 2023-02-17

produce-merges.py: Copy orig tarballs other than .gz.

376. By Colin Watson on 2023-02-16

Decide whether to update Sources based on its ctime, not its mtime.

Renaming it into place atomically means that the mtime of Sources ends
up slightly older than that of the containing directory, and we need to
check the containing directory in case of added or removed files.
Comparing against the ctime of Sources instead of its mtime seems best.

375. By Colin Watson on 2023-02-16

Silence some noisy output.

util.shell.run defaulted unspecified stdin/stdout/stderr to /dev/null.
subprocess.call and friends don't.

374. By Colin Watson on 2023-02-16

Remove unused util.tree.movetree.