Commit 560029c1 authored by Seblu's avatar Seblu
Browse files

No more custom action to set debug and quiet mode

parent d6649d20

bin/isimage

+9 −14
Original line number Diff line number Diff line
@@ -10,19 +10,10 @@ import os 
import time

import datetime

import installsystems

import installsystems.argparse as argparse # To remove when default to python 2.7

import installsystems.argparse as argparse # To be removed when python 2.7

from installsystems.printer import *

from installsystems.image import SourceImage



class ISAction(argparse.Action):

    '''Set installsystems quiet/debug mode. Argparse callback'''

    def __call__(self, parser, namespace, values, option_string=None):

        if option_string in ("-q", "--quiet"):

            installsystems.quiet = True

        elif option_string in ("-d", "--debug"):

            installsystems.debug = True





def init(args):

    '''Create an empty fresh source image tree'''

    # call init from library
@@ -52,9 +43,9 @@ p_main = argparse.ArgumentParser() 
p_main.add_argument("-V", "--version", action="version",

                    version=installsystems.version,

                    help="show installsystems version")

p_main.add_argument('-d', "--debug", action = ISAction, nargs = 0,

p_main.add_argument('-d', "--debug", action="store_true",

                    help="active debug mode")

p_main.add_argument('-q', "--quiet", action = ISAction, nargs = 0,

p_main.add_argument('-q', "--quiet", action="store_true",

                    help="active quiet mode")



subparsers = p_main.add_subparsers()
@@ -73,4 +64,8 @@ p_build.add_argument("path", nargs = "?", default = ".") 
p_build.set_defaults(func = build)

# Parse and run

args = p_main.parse_args()

# set debug and quiet mode

installsystems.debug = args.debug

installsystems.quiet = args.quiet

# exectue subparser functions

args.func(args)

bin/isinstall

+8 −15
Original line number Diff line number Diff line
@@ -17,25 +17,14 @@ from installsystems.repository import RepositoryManager, RepositoryConfig 
from installsystems.image import PackageImage

from installsystems.config import MainConfigFile, RepoConfigFile



class ISAction(argparse.Action):

    '''

    Set installsystems quiet/debug mode. Argparse callback

    '''

    def __call__(self, parser, namespace, values, option_string=None):

        if option_string in ("-q", "--quiet"):

            installsystems.debug = False

        elif option_string in ("-d", "--debug"):

            installsystems.debug = True





# Argument parsing loading

p_main = argparse.ArgumentParser()

p_main.add_argument("-V", "--version", action = "version",

                    version = installsystems.version,

                    help = "show installsystems version")

p_main.add_argument('-d', "--debug", action = ISAction, nargs = 0,

p_main.add_argument('-d', "--debug", action="store_true",

                    help="active debug mode")

p_main.add_argument('-q', "--quiet", action = ISAction, nargs = 0,

p_main.add_argument('-q', "--quiet", action="store_true",

                    help="active quiet mode")

p_main.add_argument("--no-cache", action = "store_false", default = False,

                    help = "Not use persistent db caching")
@@ -56,6 +45,10 @@ try: 
    args = p_main.parse_known_args()[0]

    # load main config

    config = MainConfigFile(args.config)

    config.merge(args)

    # set debug and quiet mode after merge

    installsystems.debug = args.debug

    installsystems.quiet = args.quiet

    # looks if arguments is a file or image name

    if istools.pathtype(args.image_name) == "file" and os.path.isfile(args.image_name):

        pkg = PackageImage(istools.abspath(args.image_name))

bin/isrepo

+18 −26
Original line number Diff line number Diff line
@@ -8,23 +8,12 @@ InstallSystems Repository Manipulation Tool 


import os

import installsystems

import installsystems.argparse as argparse # To Remove when python 2.7

import installsystems.argparse as argparse # To be removed when python 2.7

from installsystems.printer import *

from installsystems.repository import Repository, RepositoryConfig

from installsystems.image import PackageImage

from installsystems.config import MainConfigFile, RepoConfigFile



class ISAction(argparse.Action):

    '''

    Set installsystems quiet/debug mode. Argparse callback

    '''

    def __call__(self, parser, namespace, values, option_string=None):

        if option_string in ("-q", "--quiet"):

            installsystems.quiet = True

        elif option_string in ("-d", "--debug"):

            installsystems.debug = True





def init(args):

    '''

    Create an empty fresh repo tree
@@ -61,9 +50,9 @@ p_main = argparse.ArgumentParser() 
p_main.add_argument("-V", "--version", action="version",

                    version=installsystems.version,

                    help="show installsystems version")

p_main.add_argument('-d', "--debug", action = ISAction, nargs = 0,

p_main.add_argument('-d', "--debug", action="store_true",

                    help="active debug mode")

p_main.add_argument('-q', "--quiet", action = ISAction, nargs = 0,

p_main.add_argument('-q', "--quiet", action="store_true",

                    help="active quiet mode")

p_main.add_argument("-c", "--config", default="isrepo",

                    help="config file path")
@@ -91,6 +80,9 @@ try: 
    # load isinstall config

    config = MainConfigFile(args.config)

    config.merge(args)

    # set debug and quiet mode after merge

    installsystems.debug = args.debug

    installsystems.quiet = args.quiet

    # load repo configs

    repos = []

    for r_config in args.repo_config: