← Back to branch summary

~joetalbott/snappy-proposed-image-builder/add_versions

« back to all changes in this revision

Viewing changes to snappy_proposed_image_builder/worker.py

  • Committer: Joe Talbott
  • Date: 2015-06-02 17:16:50 UTC
  • Revision ID: joe.talbott@canonical.com-20150602171650-i3g9op1as9pi3p87
Avoid having payload['xyz'] all over the place.

Show diffs side-by-side

added added

removed removed

Lines of Context:
snappy_proposed_image_builder/worker.py
67
67
            )
68
68
            return MessageActions.Retry
69
69
 
70
 
        (payload['image_version'], payload['rootfs_version'],
71
 
         payload['device_version']) = _get_image_versions(
72
 
             release, channel, device)
 
70
        (image_version, rootfs_version, device_version) = _get_image_versions(
 
71
            release, channel, device)
 
72
 
 
73
        payload['image_version'] = image_version
 
74
        payload['rootfs_version'] = rootfs_version
 
75
        payload['device_version'] = device_version
73
76
 
74
77
        with tempfile.TemporaryDirectory() as tmpdir:
75
78
            logger.info("Beginning rootfs download.", extra=extra)
76
79
            try:
77
80
                rootfs_path = download_rootfs(
78
 
                    payload['image_version'],
 
81
                    image_version,
79
82
                    release,
80
83
                    channel,
81
84
                    device,
105
108
                os.remove(rootfs_path)
106
109
                try:
107
110
                    rootfs_path = download_rootfs(
108
 
                        payload['image_version'],
 
111
                        image_version,
109
112
                        channel,
110
113
                        device,
111
114
                        tmpdir
131
134
            try:
132
135
                logger.info("Building the image")
133
136
                image_path = build_image(
134
 
                    payload['image_version'],
 
137
                    image_version,
135
138
                    new_rootfs_path,
136
139
                    release,
137
140
                    channel,