OpenStack Object Storage (swift)

Merge lp:~clay-gerrard/swift/type_var_fix_1.2 into lp:swift/1.2

Proposed by clayg on 2011-03-14

Status:	Merged
Approved by:	Chuck Thier on 2011-03-15
Approved revision:	216
Merged at revision:	216
Proposed branch:	lp:~clay-gerrard/swift/type_var_fix_1.2
Merge into:	lp:swift/1.2
Diff against target:	19 lines (+3/-3) 1 file modified swift/stats/log_uploader.py (+3/-3)
To merge this branch:	bzr merge lp:~clay-gerrard/swift/type_var_fix_1.2
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Chuck Thier (community)		2011-03-14	Approve on 2011-03-15
Review via email: mp+53255@code.launchpad.net

rename var

rename var

Revision history for this message

Chuck Thier (cthier) wrote on 2011-03-15:

looks good

review: Approve

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'swift/stats/log_uploader.py'
2	--- swift/stats/log_uploader.py 2011-03-12 00:00:40 +0000
3	+++ swift/stats/log_uploader.py 2011-03-14 15:08:53 +0000
4	@@ -104,12 +104,12 @@
5	'%d': ('day', '(?P<day>[0-3][0-9])'),
6	'%H': ('hour', '(?P<hour>[0-2][0-9])'),
7	}
8	- for marker, (type, group) in markers.items():
9	+ for marker, (mtype, group) in markers.items():
10	if marker not in self.pattern:
11	self.logger.error(_('source_filename_pattern much contain a '
12	'marker %(marker)s to match the '
13	- '%(type)s') % {'marker': marker,
14	- 'type': type})
15	+ '%(mtype)s') % {'marker': marker,
16	+ 'mtype': mtype})
17	return
18	pattern = pattern.replace(marker, group)
19	return pattern