Commit f8924511 authored by Sebastien Luttringer's avatar Sebastien Luttringer
Browse files

is get can now download only payloads

parent 5f7929ab

bin/is

+3 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ def c_get(parser, args): 
    repoman = load_repositories(args)

    for image in args.image:

        img, repo = select_image(image, repoman, args.best)

        img.download(".", payload=args.payload, force=args.force)

        img.download(".", image=not args.noimage, payload=args.payload, force=args.force)



def c_help(parser, args):

    '''
@@ -441,6 +441,8 @@ p_extract.set_defaults(func=c_extract) 
p_get = subparsers.add_parser("get", help=c_get.__doc__.lower())

p_get.add_argument("-p", action="store_true", dest="payload", default=False,

                   help="get payloads")

p_get.add_argument("-I", action="store_true", dest="noimage", default=False,

                   help="do not get image")

p_get.add_argument("-f", "--force", action="store_true", default=False,

                   help="overwrite existing destinations")

p_get.add_argument("-b", "--best", action="store_true", default=False,

installsystems/image.py

+22 −21
Original line number Diff line number Diff line
@@ -633,7 +633,7 @@ class PackageImage(Image): 
            arrow(filename)

            out(self._tarball.get_str(filename))



    def download(self, directory, force=False, payload=False):

    def download(self, directory, force=False, image=True, payload=False):

        '''

        Download image in directory

        Doesn't use in memory image because we cannot access it
@@ -641,6 +641,7 @@ class PackageImage(Image): 
        '''

        # check if destination exists

        directory = os.path.abspath(directory)

        if image:

            dest = os.path.join(directory, self.filename)

            if not force and os.path.exists(dest):

                raise Exception("Image destination already exists: %s" % dest)