Commit 540be77a authored by Aurélien Dunand's avatar Aurélien Dunand Committed by Sébastien Luttringer
Browse files
parent fd826cc8
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ class PackageImage(Image):
        '''
        Diff two packaged images
        '''
        arrow("Differnce from images #y#%s v%s#R# to #r#%s v%s#R#:" % (pkg1.name,
        arrow("Difference from images #y#%s v%s#R# to #r#%s v%s#R#:" % (pkg1.name,
                                                                       pkg1.version,
                                                                       pkg2.name,
                                                                       pkg2.version))
@@ -880,7 +880,7 @@ class Payload(object):
            setattr(self, attr, None)
        # set all named param
        for kwarg in kwargs:
            # do not use hasattr which user getattr and so call md5 checksum...
            # do not use hasattr which use getattr and so call md5 checksum...
            if kwarg in self.legit_attr:
                setattr(self, kwarg, kwargs[kwarg])

@@ -891,7 +891,7 @@ class Payload(object):
        raise AttributeError

    def __setattr__(self, name, value):
        # set all value which exists have no underscore, but where undesrcore exists
        # set all value which exists have no underscore, but where underscore exists
        if name in self.legit_attr:
            object.__setattr__(self, "_%s" % name, value)
        else:
+5 −5
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ from installsystems.printer import *

class PipeFile(object):
    '''
    Pipe file object if a file object with extended capabilties
    Pipe file object if a file object with extended capabilities
    like printing progress bar or compute file size, md5 on the fly
    '''

@@ -75,7 +75,7 @@ class PipeFile(object):
        self.size = 0
        self.mtime = None
        self.consumed_size = 0
        # we already have and fo, nothing to open
        # we already have a fo, nothing to open
        if fileobj is not None:
            self.fo = fileobj
            # seek to 0 and compute filesize if we have and fd
@@ -315,7 +315,7 @@ def chrights(path, uid=None, gid=None, mode=None, mtime=None):

def pathtype(path):
    '''
    Return path type. This is usefull to know what kind of path is given
    Return path type. This is useful to know what kind of path is given
    '''
    if path.startswith("http://") or path.startswith("https://"):
        return "http"
@@ -400,8 +400,8 @@ def guess_distro(path):

def prepare_chroot(path, mount=True):
    '''
    Preate a chroot environment by mouting /{proc,sys,dev,dev/pts}
    and try to guess dest os to avoid daemon lauching
    Prepare a chroot environment by mouting /{proc,sys,dev,dev/pts}
    and try to guess dest os to avoid daemon launching
    '''
    # try to mount /proc /sys /dev /dev/pts /dev/shm
    if mount: