Code review comment for lp:~jaypipes/glance/glance-cli-tool

Revision history for this message
Jay Pipes (jaypipes) wrote :

Well, duh :) Fixing now :)

On Tue, Mar 8, 2011 at 9:22 PM, Vish Ishaya <email address hidden> wrote:
> looks like you mismerged here:
>
> === modified file 'glance/utils.py'
> 1200    --- glance/utils.py     2011-03-08 20:12:41 +0000
> 1201    +++ glance/utils.py     2011-03-09 00:10:38 +0000
> 1202    @@ -36,9 +36,10 @@
> 1203                         pv = ''
> 1204                     headers["x-image-meta-property-%s"
> 1205                             % pk.lower()] = unicode(pv)
> 1206    +        else:
> 1207    +            headers["x-image-meta-%s" % k.lower()] = unicode(v)
> 1208             if v is None:
> 1209                 v = ''
> 1210    -        headers["x-image-meta-%s" % k.lower()] = unicode(v)
> 1211         return headers
>
> the if v is None block needs to be inside the else and above the headers line.
>
> --
> https://code.launchpad.net/~jaypipes/glance/glance-cli-tool/+merge/51322
> You are the owner of lp:~jaypipes/glance/glance-cli-tool.
>

« Back to merge proposal