Merge lp://staging/~delqn/merge-o-matic/augmented-config into lp://staging/merge-o-matic
Proposed by
Delyan Raychev
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~delqn/merge-o-matic/augmented-config |
| Merge into: | lp://staging/merge-o-matic |
| Diff against target: |
1363 lines (+294/-167) (has conflicts) 21 files modified
config.sh (+7/-0) cron.daily (+9/-7) deb/version.py (+1/-1) expire-pool.py (+4/-4) generate-diffs.py (+5/-5) generate-dpatches.py (+4/-4) generate-patches.py (+6/-6) grab-merge.sh (+5/-3) mail-bugs.py (+12/-23) manual-status.py (+9/-18) merge-status.py (+11/-16) mom.conf (+41/-0) momlib.py (+101/-30) pack-archive.sh (+3/-1) produce-merges.py (+10/-10) publish-patches.py (+7/-7) stats-graphs.py (+13/-4) stats.py (+6/-6) syndicate.py (+21/-12) update-pool.py (+12/-8) update-sources.py (+7/-2) Text conflict in momlib.py Text conflict in stats-graphs.py Text conflict in syndicate.py Text conflict in update-sources.py |
| To merge this branch: | bzr merge lp://staging/~delqn/merge-o-matic/augmented-config |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Core Development Team | Pending | ||
|
Review via email:
|
|||
Commit message
Created an additional file to hold all distro-specific parameters. momlib.py will now depend on the configuration file for proper server names, emal addresses etc.
Description of the change
Augmented hard-coded distribution specific values into a python configuration file. Added mom.config and config.sh
With these changes other GNU/Linux distributions would be able to quickly and easily adapt merge-o-matic to their needs.
To post a comment you must log in.
Unmerged revisions
- 175. By Delyan Raychev
-
Switching mom.conf to maverick
- 174. By Delyan Raychev
-
Committing newly added files - mom.conf, config.sh
- 173. By Delyan Raychev
-
Committing newly added files
- 172. By Delyan Raychev
-
Rename config.py to mom.conf
- 171. By Delyan Raychev <de@pelin>
-
Augmenting hardcoded distro-specific values to a config file; adding config.py and config.sh
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
