Stop using deprecated pipes.quote
Instead use the definition from python-six. Once we drop Py 2 support completely, we'll just swap underscores with dots. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
parent
797b13b34a
commit
f3806f7c77
12 changed files with 52 additions and 56 deletions
|
|
@ -16,10 +16,7 @@ from kobo import shortcuts
|
|||
import os
|
||||
import productmd
|
||||
import tempfile
|
||||
try:
|
||||
from shlex import quote
|
||||
except ImportError:
|
||||
from pipes import quote
|
||||
from six.moves import shlex_quote
|
||||
|
||||
from pungi import util
|
||||
from pungi.phases.buildinstall import tweak_configs
|
||||
|
|
@ -27,7 +24,7 @@ from pungi.wrappers import iso
|
|||
|
||||
|
||||
def sh(log, cmd, *args, **kwargs):
|
||||
log.info('Running: %s', ' '.join(quote(x) for x in cmd))
|
||||
log.info('Running: %s', ' '.join(shlex_quote(x) for x in cmd))
|
||||
ret, out = shortcuts.run(cmd, *args, universal_newlines=True, **kwargs)
|
||||
if out:
|
||||
log.debug('%s', out)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue