[blivet:master 06/13] Simplify call to _parseOneLine() and suppress warning about unused argument

Anne Mulhern amulhern at redhat.com
Fri Apr 25 15:46:04 UTC 2014





----- Original Message -----
> From: "mulhern" <amulhern at redhat.com>
> To: anaconda-patches at lists.fedorahosted.org
> Cc: "mulhern" <amulhern at redhat.com>
> Sent: Friday, April 25, 2014 8:54:25 AM
> Subject: [blivet:master 06/13] Simplify call to _parseOneLine() and suppress warning about unused argument
> 
> Signed-off-by: mulhern <amulhern at redhat.com>
> ---
>  blivet/__init__.py | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/blivet/__init__.py b/blivet/__init__.py
> index 91ce139..c9a980a 100644
> --- a/blivet/__init__.py
> +++ b/blivet/__init__.py
> @@ -2436,7 +2436,7 @@ class FSSet(object):
>                  filesystems[device.format.mountpoint] = device
>          return filesystems
>  
> -    def _parseOneLine(self, (devspec, mountpoint, fstype, options, dump,
> passno)):
> +    def _parseOneLine(self, (devspec, mountpoint, fstype, options, _dump,
> passno)):
>          # no sense in doing any legwork for a noauto entry
>          if "noauto" in options.split(","):
>              log.info("ignoring noauto entry")
> @@ -2595,10 +2595,8 @@ class FSSet(object):
>                  elif len(fields) == 5:
>                      fields.append(0)
>  
> -                (devspec, mountpoint, fstype, options, dump, passno) =
> fields
> -
>                  try:
> -                    device = self._parseOneLine((devspec, mountpoint,
> fstype, options, dump, passno))
> +                    device = self._parseOneLine(tuple(fields))
>                  except UnrecognizedFSTabEntryError:
>                      # just write the line back out as-is after upgrade
>                      self.preserveLines.append(line)
> --
> 1.8.3.1
> 
> 

I'm withdrawing this one from the patch set.

It's not wrong, but it's not complete either.

- mulhern


More information about the anaconda-patches mailing list