Commit cab31ac7 authored by Thibault VINCENT's avatar Thibault VINCENT
Browse files

fix: execute util improvement

parent 89825abe

ccnode/utils.py

+12 −8
Original line number Diff line number Diff line
@@ -179,7 +179,6 @@ class Exec(object): 
                                                            merge_output=True):

        '''

        '''

        stdout, stderr = None, None

        if capture_output:

            stdout = subprocess.PIPE

            if merge_output:
@@ -189,16 +188,21 @@ class Exec(object): 
        else:

            stdout = open(os.devnull, 'w')

            stderr = stdout

        print 'DBG>>> ' + ' '.join(cmd)

        proc = subprocess.Popen(cmd, shell=shell, stdout=stdout, stderr=stderr)

        if input is None:

            output = proc.communicate()

        ##print 'DBG>>>', ' '.join(cmd)

        if input is not None:

            stdin = subprocess.PIPE

            ##print '       input=`%s`' % input

        else:

            stdin = None

        proc = subprocess.Popen(cmd, shell=shell, stdout=stdout, stderr=stderr,

                                                                stdin=stdin)

        output = proc.communicate(input=input)

        ##print '       rc=`%d` out=`%s`' % (proc.returncode, output)

        return (proc.returncode, output)

    

    @staticmethod

    def silent(cmd, shell=False):

    def silent(cmd, **kwargs):

        '''

        '''

        return Exec.call(cmd, shell=shell, capture_output=False)[0]
 
        kwargs['capture_output'] = False

        return Exec.call(cmd, **kwargs)[0]