[PATCH] cleanup execWith* call arguments

Vratislav Podzimek vpodzime at redhat.com
Tue Feb 12 11:03:14 UTC 2013


On Mon, 2013-02-11 at 11:54 -0800, Brian C. Lane wrote:
> From: "Brian C. Lane" <bcl at redhat.com>
> 
> ---
>  src/sbin/livemedia-creator | 60 +++++++++++++++++++++++-----------------------
>  1 file changed, 30 insertions(+), 30 deletions(-)
> 
> diff --git a/src/sbin/livemedia-creator b/src/sbin/livemedia-creator
> index 202e963..0b40e61 100755
> --- a/src/sbin/livemedia-creator
> +++ b/src/sbin/livemedia-creator
> @@ -253,55 +253,55 @@ class VirtualInstall( object ):
>          self.virt_name = "LiveOS-"+str(uuid.uuid4())
>          # add --graphics none later
>          # add whatever serial cmds are needed later
> -        cmd = [ "virt-install", "-n", self.virt_name,
> -                                "-r", str(memory),
> -                                "--noreboot",
> -                                "--noautoconsole" ]
> +        args = ["-n", self.virt_name,
> +                 "-r", str(memory),
> +                 "--noreboot",
> +                 "--noautoconsole"]
>  
> -        cmd.append("--graphics")
> +        args.append("--graphics")
>          if vnc:
> -            cmd.append(vnc)
> +            args.append(vnc)
>          else:
> -            cmd.append("none")
> +            args.append("none")
>  
>          for ks in ks_paths:
> -            cmd.append("--initrd-inject")
> -            cmd.append(ks)
> +            args.append("--initrd-inject")
> +            args.append(ks)
>  
>          disk_opts = "path={0}".format(disk_img)
>          disk_opts += ",format=raw"
>          if not os.path.isfile(disk_img):
>              disk_opts += ",size={0}".format(img_size)
> -        cmd.append("--disk")
> -        cmd.append(disk_opts)
> +        args.append("--disk")
> +        args.append(disk_opts)
>  
>          if iso.liveos:
>              disk_opts = "path={0},device=cdrom".format(iso.iso_path)
> -            cmd.append("--disk")
> -            cmd.append(disk_opts)
> +            args.append("--disk")
> +            args.append(disk_opts)
>  
>          extra_args = "ks=file:/{0}".format(os.path.basename(ks_paths[0]))
>          if kernel_args:
>              extra_args += " "+kernel_args
>          if iso.liveos:
>              extra_args += " stage2=live:CDLABEL={0}".format(udev_escape(iso.label))
> -        cmd.append("--extra-args")
> -        cmd.append(extra_args)
> +        args.append("--extra-args")
> +        args.append(extra_args)
>  
> -        cmd.append("--location")
> -        cmd.append(iso.mount_dir)
> +        args.append("--location")
> +        args.append(iso.mount_dir)
>  
>          channel_args = "tcp,host={0}:{1},mode=connect,target_type=virtio" \
>                         ",name=org.fedoraproject.anaconda.log.0".format(
>                         virtio_host, virtio_port)
> -        cmd.append("--channel")
> -        cmd.append(channel_args)
> +        args.append("--channel")
> +        args.append(channel_args)
>  
>          if arch:
> -            cmd.append("--arch")
> -            cmd.append(arch)
> +            args.append("--arch")
> +            args.append(arch)
>  
> -        rc = execWithRedirect( cmd[0], cmd[1:] )
> +        rc = execWithRedirect("virt-install", args)
>          if rc:
>              raise Exception("Problem starting virtual install")
>  
> @@ -544,30 +544,30 @@ def novirt_install(opts, disk_img, disk_size, repo_url):
>          selinux_enforcing = True
>          selinux.security_setenforce(0)
>  
> -    cmd = ["anaconda", "--kickstart", opts.ks[0], "--cmdline", "--repo", repo_url]
> +    args = ["--kickstart", opts.ks[0], "--cmdline", "--repo", repo_url]
>      if opts.anaconda_args:
>          for arg in opts.anaconda_args:
> -            cmd += arg.split(" ", 1)
> +            args += arg.split(" ", 1)
>      if opts.proxy:
> -        cmd += ["--proxy", opts.proxy]
> +        args += ["--proxy", opts.proxy]
>      if opts.armplatform:
> -        cmd += ["--armplatform", opts.armplatform]
> +        args += ["--armplatform", opts.armplatform]
>  
>      if opts.make_iso or opts.make_fsimage:
>          # Make a blank fs image
> -        cmd += ["--dirinstall"]
> +        args += ["--dirinstall"]
>  
>          mkext4img(None, disk_img, label="Anaconda", size=disk_size * 1024**3)
>          if not os.path.isdir(ROOT_PATH):
>              os.mkdir(ROOT_PATH)
>          mount(disk_img, opts="loop", mnt=ROOT_PATH)
>      else:
> -        cmd += ["--image", disk_img]
> +        args += ["--image", disk_img]
>  
>          # Create the sparse image
> -        mksparse( disk_img, disk_size * 1024**3 )
> +        mksparse(disk_img, disk_size * 1024**3)
>  
> -    rc = execWithRedirect(cmd[0], cmd[1:])
> +    rc = execWithRedirect("anaconda", args)
>  
>      # Move the anaconda logs over to a log directory
>      log_dir = os.path.abspath(os.path.dirname(opts.logfile))
ACK.

-- 
Vratislav Podzimek

Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic



More information about the anaconda-patches mailing list