← Back to branch summary

~verterok/charms/xenial/conn-check/focal

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/fetch/centos.py

  • Committer: Guillermo Gonzalez
  • Date: 2023-06-29 16:33:24 UTC
  • Revision ID: guillermo.gonzalez@canonical.com-20230629163324-03vq3m9qtvu6f6or
update charmhelpers

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/fetch/centos.py
15
15
import subprocess
16
16
import os
17
17
import time
18
 
import six
19
18
import yum
20
19
 
21
20
from tempfile import NamedTemporaryFile
42
41
    if options is not None:
43
42
        cmd.extend(options)
44
43
    cmd.append('install')
45
 
    if isinstance(packages, six.string_types):
 
44
    if isinstance(packages, str):
46
45
        cmd.append(packages)
47
46
    else:
48
47
        cmd.extend(packages)
71
70
def purge(packages, fatal=False):
72
71
    """Purge one or more packages."""
73
72
    cmd = ['yum', '--assumeyes', 'remove']
74
 
    if isinstance(packages, six.string_types):
 
73
    if isinstance(packages, str):
75
74
        cmd.append(packages)
76
75
    else:
77
76
        cmd.extend(packages)
83
82
    """Search for a package."""
84
83
    output = {}
85
84
    cmd = ['yum', 'search']
86
 
    if isinstance(packages, six.string_types):
 
85
    if isinstance(packages, str):
87
86
        cmd.append(packages)
88
87
    else:
89
88
        cmd.extend(packages)
132
131
                key_file.write(key)
133
132
                key_file.flush()
134
133
                key_file.seek(0)
135
 
            subprocess.check_call(['rpm', '--import', key_file])
 
134
                subprocess.check_call(['rpm', '--import', key_file.name])
136
135
        else:
137
136
            subprocess.check_call(['rpm', '--import', key])
138
137