[elbe-devel] [PATCH v3] virtapt: use os.path.join to join paths

[Volker Haspel]

On Mon, 13 Aug 2018 12:13:34 +0200
Manuel Traut <manut at linutronix.de> wrote:

> doing it with string joins is error prune
> 
> Signed-off-by: Manuel Traut <manut at linutronix.de>

Reviewed-by: Volker Haspel <volker.haspel at linutronix.de>

> ---
> 
> changes since v2:
>   * remove leading slashes from second argument to avoid ignoring first argument
> 
>  elbepack/virtapt.py | 24 ++++++++++++------------
>  1 file changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/elbepack/virtapt.py b/elbepack/virtapt.py
> index e486c5e5..7b9cf7a4 100644
> --- a/elbepack/virtapt.py
> +++ b/elbepack/virtapt.py
> @@ -151,16 +151,16 @@ class VirtApt:
>              file.close()
>  
>      def initialize_dirs(self):
> -        self.mkdir_p(self.projectpath + "/cache/archives/partial")
> -        self.mkdir_p(self.projectpath + "/etc/apt/preferences.d")
> -        self.mkdir_p(self.projectpath + "/etc/apt/trusted.gpg.d")
> -        self.mkdir_p(self.projectpath + "/db")
> -        self.mkdir_p(self.projectpath + "/log")
> -        self.mkdir_p(self.projectpath + "/state/lists/partial")
> -        self.touch(self.projectpath + "/state/status")
> +        self.mkdir_p(os.path.join(self.projectpath, "cache/archives/partial"))
> +        self.mkdir_p(os.path.join(self.projectpath, "etc/apt/preferences.d"))
> +        self.mkdir_p(os.path.join(self.projectpath, "etc/apt/trusted.gpg.d"))
> +        self.mkdir_p(os.path.join(self.projectpath, "db"))
> +        self.mkdir_p(os.path.join(self.projectpath, "log"))
> +        self.mkdir_p(os.path.join(self.projectpath, "state/lists/partial"))
> +        self.touch(os.path.join(self.projectpath, "state/status"))
>  
>      def setup_gpg(self):
> -        ring_path = self.projectpath + "/etc/apt/trusted.gpg"
> +        ring_path = os.path.join(self.projectpath, "etc/apt/trusted.gpg")
>          if not os.path.isdir("/etc/apt/trusted.gpg.d"):
>              print("/etc/apt/trusted.gpg.d doesn't exist")
>              print("apt-get install debian-archive-keyring may "
> @@ -189,8 +189,8 @@ class VirtApt:
>                  print("adding elbe-pubkey to keyring failed")
>  
>      def add_pubkey_url(self, url):
> -        ring_path = self.projectpath + "/etc/apt/trusted.gpg"
> -        tmpkey_path = self.projectpath + "/tmpkey.gpg"
> +        ring_path = os.path.join(self.projectpath, "etc/apt/trusted.gpg")
> +        tmpkey_path = os.path.join(self.projectpath, "tmpkey.gpg")
>  
>          gpg_options = '--keyring "%s" --no-auto-check-trustdb ' \
>                        '--trust-model always --no-default-keyring ' \
> @@ -205,7 +205,7 @@ class VirtApt:
>              system('rm "%s"' % tmpkey_path, allow_fail=True)
>  
>      def create_apt_sources_list(self, mirror):
> -        filename = self.projectpath + "/etc/apt/sources.list"
> +        filename = os.path.join(self.projectpath, "etc/apt/sources.list")
>  
>          if os.path.exists(filename):
>              os.remove(filename)
> @@ -215,7 +215,7 @@ class VirtApt:
>          file.close()
>  
>      def create_apt_prefs(self, prefs):
> -        filename = self.projectpath + "/etc/apt/preferences"
> +        filename = os.path.join(self.projectpath, "etc/apt/preferences")
>  
>          if os.path.exists(filename):
>              os.remove(filename)