Commit ca30135f authored by Aurélien Dunand's avatar Aurélien Dunand Committed by Sébastien Luttringer
Browse files

Fix typos in manmpage and comments



Thanks to Nicolas for reviewing the manpage

Signed-off-by: default avatarSébastien Luttringer <sebastien.luttringer@smartjog.com>
parent 459626cd
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ def arg_parser_init():
    '''
    Create command parser
    '''
    # Top level argument parsing
    # top level argument parsing
    parser = argparse.ArgumentParser()
    parser.add_argument("-V", "--version", action="version",
                        version=installsystems.version)
+9 −9
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ OPTIONS
    show an help message and exit

-V, --version
    show installsystems version
    show InstallSystems version

-v {0,1,2}, --verbosity {0,1,2}
    show InstallSystems version
@@ -122,7 +122,7 @@ check [-h] *repository*


chroot [-h] [-m] [-s *SHELL*\ ] *path*
    Chroot inside *path*. This is especially usefull to update system images. This mounts filesystems (/proc, /sys, /dev, /dev/pts, /dev/shm), modify a few config files (resolv.conf, mtab) and finally executes a shell in your chroot (default: /bin/bash)
    Chroot inside *path*. This is especially useful to update system images. This mounts filesystems (/proc, /sys, /dev, /dev/pts, /dev/shm), modify a few config files (resolv.conf, mtab) and finally executes a shell in your chroot (default: /bin/bash)

    -m, --no-mount
        disable mounting of /{proc,dev,sys}
@@ -142,14 +142,14 @@ copy [-h] [-f] *image*... *repository*
    Copy one *image* (or more) to another local **repository**.

     -f, --force
         overwrite existing images whithout prompting
         overwrite existing images without prompting


del [-h] [-f] [-p] *image*...
    Delete one *image* (or more) from its repository.

    -f, --force
        delete images whithout prompting
        delete images without prompting

    -p, --preserve
        do not remove payloads from the repository
@@ -173,7 +173,7 @@ extract [-h] [-f] [-g] [-p] *image* *path*


get [-h] [-f] [-I] [-p] *image*...
    Download a remote InstallSystem *image* in current directory.
    Download a remote InstallSystems *image* in current directory.

    -f, --force
        overwrite existing destination
@@ -279,7 +279,7 @@ repo [-h] [-j] [-l|-r] [-o|-O] [-s] [-u] [--purge] [repository]...
        output is formated in json

    -l, --local
        list local repositoriez (filter)
        list local repositories (filter)

    -r, --remote
        list remote repositories (filter)
@@ -337,7 +337,7 @@ InstallSystems use two kind of images:

**source image**

     Each image available in repositories has to be build. The image before building is called a source image. In a source image, there are five directories and two files. Each images make the distinction between scripts and payloads.
     Each image available in repositories has to be built. The image before building is called a source image. In a source image, there are typically five directories and three files.

    build/
        Scripts to customize the build process for the image.
@@ -349,7 +349,7 @@ InstallSystems use two kind of images:
        The scripts with logical steps of the install are in this directory.

    lib/
        Python modules which are embeded in image.
        Python modules needed to build and/or to install the image

    payload/
        This directory embeds one or more payloads (typically rootfs) for the image.
@@ -376,5 +376,5 @@ REPOSITORIES

InstallSystems manages images with repositories.

An InstallSystems repository use a SQLite3 database (db), a last file (timestamp of last db modification) and MD5s of images. The repos are reachable by HTTP(S), FTP and SSH. This allows you to easily access images.
An InstallSystems repository use a SQLite3 database (db), a last file (timestamp of last db modification) and MD5s of images. Repositories are reachable by HTTP(S), FTP and SSH. This allows you to easily access images.
Also, please note that you can only modify local repositories.
+6 −6
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ class Image(object):
            bytecode = compile(code, filename.encode(locale.getpreferredencoding()), "exec")
        except Exception as e:
            raise ISError(u"Unable to compile %s" % filename, e)
        # Load module
        # load module
        try:
            exec bytecode in module.__dict__
        except Exception as e:
@@ -697,7 +697,7 @@ class PackageImage(Image):
                                                                         pkg1.version,
                                                                         pkg2.name,
                                                                         pkg2.version))
        # Extract images for diff scripts files
        # extract images for diff scripts files
        fromfiles = set(pkg1._tarball.getnames(re_pattern="(parser|setup)/.*"))
        tofiles = set(pkg2._tarball.getnames(re_pattern="(parser|setup)/.*"))
        for f in fromfiles | tofiles:
@@ -748,7 +748,7 @@ class PackageImage(Image):
            fileobj.consume(memfile)
            # close source
            fileobj.close()
            # get donwloaded size and md5
            # get downloaded size and md5
            self.size = fileobj.read_size
            self.md5 = fileobj.md5
            memfile.seek(0)
@@ -974,7 +974,7 @@ class PackageImage(Image):
        if load_modules:
            self.load_modules(lambda: self.select_scripts("lib"))
        # run parser scripts to extend extparser
        # those scripts should only extand the parser or produce error
        # those scripts should only extend the parser or produce error
        if run_parser:
            self.run_scripts("parser",
                             lambda: self.select_scripts("parser"),
@@ -984,7 +984,7 @@ class PackageImage(Image):
        arrow("Parsing command line")
        # encode command line arguments to utf-8
        args = istools.argv()[1:]
        # Catch exception in custom argparse action
        # catch exception in custom argparse action
        try:
            args = parser.parse_args(args=args)
        except Exception as e:
@@ -1162,7 +1162,7 @@ class Payload(object):
                raise ISError(u"Destination %s is a directory" % dest)
            if not force:
                raise ISError(u"File %s already exists" % dest)
        # Open remote file
        # open remote file
        debug(u"Downloading payload %s from %s" % (self.filename, self.path))
        fs = PipeFile(self.path, progressbar=True)
        # check if announced file size is good