Revision 61d14323

b/image_creator/bundle_volume.py
380 380

  
381 381
            target = tempfile.mkdtemp()
382 382
            try:
383
                absmpoints = self._mount(target,
384
                                         [(mapped[i], filesystem[i].mpoint)
385
                                         for i in mapped.keys()])
383
                self._mount(
384
                    target,
385
                    [(mapped[i], filesystem[i].mpoint) for i in mapped.keys()])
386

  
386 387
                excluded = self._to_exclude()
387 388

  
388 389
                rsync = Rsync(self.out)
b/image_creator/dialog_menu.py
33 33
# interpreted as representing official policies, either expressed
34 34
# or implied, of GRNET S.A.
35 35

  
36
import sys
37 36
import os
38 37
import textwrap
39 38
import StringIO
......
65 64
]
66 65

  
67 66

  
68
class metadata_monitor(object):
67
class MetadataMonitor(object):
69 68
    def __init__(self, session, meta):
70 69
        self.session = session
71 70
        self.meta = meta
......
554 553
                            del session['checksum']
555 554

  
556 555
                        # Monitor the metadata changes during syspreps
557
                        with metadata_monitor(session, image_os.meta):
556
                        with MetadataMonitor(session, image_os.meta):
558 557
                            image_os.do_sysprep()
559 558
                            infobox.finalize()
560 559

  
......
590 589

  
591 590
    if not d.yesno("%s\n\nDo you want to continue?" % msg, width=WIDTH,
592 591
                   height=12, title="Image Shrinking"):
593
        with metadata_monitor(session, dev.meta):
592
        with MetadataMonitor(session, dev.meta):
594 593
            infobox = InfoBoxOutput(d, "Image Shrinking", height=4)
595 594
            dev.out.add(infobox)
596 595
            try:
......
640 639

  
641 640
def main_menu(session):
642 641
    d = session['dialog']
643
    dev = session['device']
644 642

  
645 643
    update_background_title(session)
646 644

  
b/image_creator/dialog_wizard.py
33 33
# interpreted as representing official policies, either expressed
34 34
# or implied, of GRNET S.A.
35 35

  
36
import dialog
37 36
import time
38 37
import StringIO
39 38

  
b/image_creator/disk.py
43 43
import tempfile
44 44
import uuid
45 45
import re
46
import sys
47 46
import guestfs
48 47
import shutil
49 48
from sendfile import sendfile
b/image_creator/kamaki_wrapper.py
39 39
from kamaki.clients.pithos import PithosClient
40 40
from kamaki.clients.astakos import AstakosClient
41 41

  
42
from image_creator.util import FatalError
43

  
44 42

  
45 43
class Kamaki(object):
46 44

  
b/image_creator/main.py
34 34
# or implied, of GRNET S.A.
35 35

  
36 36
from image_creator import __version__ as version
37
from image_creator import util
38 37
from image_creator.disk import Disk
39 38
from image_creator.util import FatalError, MD5
40 39
from image_creator.output.cli import SilentOutput, SimpleOutput, \
......
196 195
        except ClientError as e:
197 196
            raise FatalError("Astakos client: %d %s" % (e.status, e.message))
198 197

  
199

  
200 198
    disk = Disk(options.source, out, options.tmp)
201 199

  
202 200
    def signal_handler(signum, frame):
b/image_creator/os_type/freebsd.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34
from image_creator.os_type.unix import Unix, sysprep
34
from image_creator.os_type.unix import Unix
35 35

  
36 36

  
37 37
class Freebsd(Unix):
b/image_creator/os_type/hurd.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34
from image_creator.os_type.unix import Unix, sysprep
34
from image_creator.os_type.unix import Unix
35 35

  
36 36

  
37 37
class Hurd(Unix):
b/image_creator/os_type/netbsd.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34
from image_creator.os_type.unix import Unix, sysprep
34
from image_creator.os_type.unix import Unix
35 35

  
36 36

  
37 37
class Netbsd(Unix):
b/image_creator/os_type/ubuntu.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34
from image_creator.os_type.linux import Linux, sysprep
34
from image_creator.os_type.linux import Linux
35 35

  
36 36

  
37 37
class Ubuntu(Linux):
b/image_creator/os_type/unix.py
32 32
# or implied, of GRNET S.A.
33 33

  
34 34
import re
35
import sys
36 35

  
37 36
from image_creator.os_type import OSBase, sysprep
38 37

  
b/image_creator/os_type/windows.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34
from image_creator.os_type import OSBase, sysprep
34
from image_creator.os_type import OSBase
35 35

  
36 36

  
37 37
class Windows(OSBase):
b/image_creator/util.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34
import sys
35 34
import sh
36 35
import hashlib
37 36
import time

Also available in: Unified diff