Revision f5174d2c image_creator/dialog_util.py
b/image_creator/dialog_util.py | ||
---|---|---|
43 | 43 |
|
44 | 44 |
def update_background_title(session): |
45 | 45 |
d = session['dialog'] |
46 |
dev = session['device'] |
|
47 | 46 |
disk = session['disk'] |
47 |
image = session['image'] |
|
48 | 48 |
|
49 | 49 |
MB = 2 ** 20 |
50 | 50 |
|
51 |
size = (dev.size + MB - 1) // MB
|
|
51 |
size = (image.size + MB - 1) // MB
|
|
52 | 52 |
shrinked = 'shrinked' in session and session['shrinked'] |
53 | 53 |
postfix = " (shrinked)" if shrinked else '' |
54 | 54 |
|
55 | 55 |
title = "OS: %s, Distro: %s, Size: %dMB%s, Source: %s" % \ |
56 |
(dev.ostype, dev.distro, size, postfix,
|
|
56 |
(image.ostype, image.distro, size, postfix,
|
|
57 | 57 |
os.path.abspath(disk.source)) |
58 | 58 |
|
59 | 59 |
d.setBackgroundTitle(title) |
... | ... | |
128 | 128 |
|
129 | 129 |
gauge = GaugeOutput(d, "Image Extraction", "Extracting image...") |
130 | 130 |
try: |
131 |
dev = session['device']
|
|
132 |
out = dev.out
|
|
131 |
image = session['image']
|
|
132 |
out = image.out
|
|
133 | 133 |
out.add(gauge) |
134 | 134 |
try: |
135 | 135 |
if "checksum" not in session: |
136 |
size = dev.size |
|
137 | 136 |
md5 = MD5(out) |
138 |
session['checksum'] = md5.compute(session['snapshot'], |
|
139 |
size) |
|
137 |
session['checksum'] = md5.compute(image.device, image.size) |
|
140 | 138 |
|
141 | 139 |
# Extract image file |
142 |
dev.dump(path)
|
|
140 |
image.dump(path)
|
|
143 | 141 |
|
144 | 142 |
# Extract metadata file |
145 | 143 |
out.output("Extracting metadata file...") |
Also available in: Unified diff