Revision 34e7a04a image_creator/dialog_menu.py

b/image_creator/dialog_menu.py
157 157
        session['upload'] = filename
158 158
        break
159 159

  
160
    gauge = GaugeOutput(d, "Image Upload", "Uploading...")
160
    gauge = GaugeOutput(d, "Image Upload", "Uploading ...")
161 161
    try:
162 162
        out = image.out
163 163
        out.add(gauge)
......
175 175
                                      "Calculating block hashes",
176 176
                                      "Uploading missing blocks")
177 177
                # Upload md5sum file
178
                out.output("Uploading md5sum file...")
178
                out.output("Uploading md5sum file ...")
179 179
                md5str = "%s %s\n" % (session['checksum'], filename)
180 180
                kamaki.upload(StringIO.StringIO(md5str), size=len(md5str),
181 181
                              remote_path="%s.md5sum" % filename)
......
243 243
            metadata[key] = 'yes'
244 244

  
245 245
    img_type = "public" if is_public else "private"
246
    gauge = GaugeOutput(d, "Image Registration", "Registering image...")
246
    gauge = GaugeOutput(d, "Image Registration", "Registering image ...")
247 247
    try:
248 248
        out = session['image'].out
249 249
        out.add(gauge)
250 250
        try:
251 251
            try:
252
                out.output("Registering %s image with the cloud..." % img_type)
252
                out.output("Registering %s image with the cloud ..." %
253
                           img_type)
253 254
                kamaki = Kamaki(session['account'], out)
254 255
                result = kamaki.register(name, session['pithos_uri'], metadata,
255 256
                                         is_public)
256 257
                out.success('done')
257 258
                # Upload metadata file
258
                out.output("Uploading metadata file...")
259
                out.output("Uploading metadata file ...")
259 260
                metastring = unicode(json.dumps(result, ensure_ascii=False))
260 261
                kamaki.upload(StringIO.StringIO(metastring),
261 262
                              size=len(metastring),
262 263
                              remote_path="%s.meta" % session['upload'])
263 264
                out.success("done")
264 265
                if is_public:
265
                    out.output("Sharing metadata and md5sum files...")
266
                    out.output("Sharing metadata and md5sum files ...")
266 267
                    kamaki.share("%s.meta" % session['upload'])
267 268
                    kamaki.share("%s.md5sum" % session['upload'])
268 269
                    out.success('done')
......
800 801
                break
801 802
        elif choice == "Reset":
802 803
            if confirm_reset(d):
803
                d.infobox("Resetting snf-image-creator. Please wait...",
804
                d.infobox("Resetting snf-image-creator. Please wait ...",
804 805
                          width=SMALL_WIDTH)
805 806
                raise Reset
806 807
        elif choice == "Help":

Also available in: Unified diff