Ubuntu Distributed Development

Merge lp:~maxb/udd/misc-tidying into lp:udd

  1. misc-tidying
  2. Merge into import-scripts
Proposed by Max Bowsher
Status: Merged
Merged at revision: 364
Proposed branch: lp:~maxb/udd/misc-tidying
Merge into: lp:udd
Diff against target: 28 lines (+3/-3)
1 file modified
icommon.py (+3/-3)
To merge this branch: bzr merge lp:~maxb/udd/misc-tidying
Reviewer Review Type Date Requested Status
James Westby Approve
Review via email: mp+37408@code.launchpad.net

Description of the change

Here are some minor points of cleanup I came across whilst working on other changes, and I didn't want to bundle in those branches.

To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

Looks good.

Thanks,

James

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'icommon.py'
2--- icommon.py 2010-10-03 01:58:31 +0000
3+++ icommon.py 2010-10-03 17:14:41 +0000
4@@ -34,7 +34,6 @@
5 base_dir = "/srv/package-import.canonical.com/new/"
6 if not os.path.exists(base_dir):
7 base_dir = "."
8-packages_dir = os.path.join(base_dir, "packages")
9 logs_dir = os.path.join(base_dir, "logs")
10 retry_dir = os.path.join(logs_dir, "retry")
11 priority_dir = os.path.join(logs_dir, "priority")
12@@ -61,7 +60,7 @@
13 no_lock_returncode = 139
14
15
16-for directory in (packages_dir, logs_dir, retry_dir, priority_dir, lists_dir,
17+for directory in (logs_dir, retry_dir, priority_dir, lists_dir,
18 revids_dir, locks_dir, updates_dir,
19 debian_diffs_dir, ubuntu_merge_dir,
20 ):
21@@ -1368,7 +1367,8 @@
22 def push_location(self, distro, release, pocket):
23 raise NotImplementedError(self.push_location)
24
25- def set_official(self, distro, release, pocket, set_status=False):
26+ def set_official(self, distro, release, pocket, set_status=False,
27+ set_reviewer=False):
28 raise NotImplementedError(self.set_official)
29
30

Subscribers

People subscribed via source and target branches