← Back to branch summary

~ubuntu-managed-branches/ubuntu-system-image/system-image

« back to all changes in this revision

Viewing changes to systemimage/dbus.py

  • Committer: CI bot
  • Author(s): Barry Warsaw
  • Date: 2014-09-29 19:02:35 UTC
  • mfrom: (238.1.3 citrain-250u1)
  • Revision ID: ps-jenkins@lists.canonical.com-20140929190235-k80lgmux9o35dsm1
Fixes for LP: #1369717 and LP: #1370586 Fixes: 1369717, 1370586

Show diffs side-by-side

added added

removed removed

Lines of Context:
systemimage/dbus.py
334
334
    def Information(self):
335
335
        self._loop.keepalive()
336
336
        settings = Settings()
337
 
        return dict(
338
 
            current_build_number=str(config.build_number),
 
337
        current_build_number = str(config.build_number)
 
338
        response = dict(
 
339
            current_build_number=current_build_number,
339
340
            device_name=config.device,
340
341
            channel_name=config.channel,
341
342
            last_update_date=last_update_date(),
342
343
            version_detail=getattr(config.service, 'version_detail', ''),
343
344
            last_check_date=settings.get('last_check_date'),
344
345
            )
 
346
        if self._update is None:
 
347
            response['target_build_number'] = '-1'
 
348
        elif not self._update.is_available:
 
349
            response['target_build_number'] = current_build_number
 
350
        else:
 
351
            response['target_build_number'] = str(self._update.version)
 
352
        return response
345
353
 
346
354
    @log_and_exit
347
355
    @method('com.canonical.SystemImage', in_signature='ss')