sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2025-02-07 05:30:44 +00:00
Code Issues Releases Wiki Activity

Merge pull request #87 from bjackman/localconnection-glob

Browse Source 
Enhancements for LocalConnection
This commit is contained in:
setrofim 2017-02-01 08:50:38 +00:00 committed by GitHub
commit 5472b671ef
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devlib/host.py
View File

@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
from glob import iglob
import os import os
import shutil import shutil
import subprocess import subprocess
@ -41,7 +42,12 @@ class LocalConnection(object):
def pull(self, source, dest, timeout=None, as_root=False): # pylint: disable=unused-argument def pull(self, source, dest, timeout=None, as_root=False): # pylint: disable=unused-argument
self.logger.debug('cp {} {}'.format(source, dest)) self.logger.debug('cp {} {}'.format(source, dest))
shutil.copy(source, dest) if ('*' in source or '?' in source) and os.path.isdir(dest):
# Pull all files matching a wildcard expression
for each_source in iglob(source):
shutil.copy(each_source, dest)
else:
shutil.copy(source, dest)
def execute(self, command, timeout=None, check_exit_code=True, as_root=False): def execute(self, command, timeout=None, check_exit_code=True, as_root=False):
self.logger.debug(command) self.logger.debug(command)
@ -54,7 +60,9 @@ class LocalConnection(object):
try: try:
return check_output(command, shell=True, timeout=timeout, ignore=ignore)[0] return check_output(command, shell=True, timeout=timeout, ignore=ignore)[0]
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
raise TargetError(e) message = 'Got exit code {}\nfrom: {}\nOUTPUT: {}'.format(
e.returncode, command, e.output)
raise TargetError(message)
def background(self, command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, as_root=False): def background(self, command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, as_root=False):
if as_root: if as_root:

8
doc/connection.rst
View File

@ -25,15 +25,17 @@ class that implements the following methods.
Transfer a file from the host machine to the connected device. Transfer a file from the host machine to the connected device.
:param source: path of to the file on the host :param source: path of to the file on the host
:param dest: path of to the file on the connected :param dest: path of to the file on the connected device.
:param timeout: timeout (in seconds) for the transfer; if the transfer does :param timeout: timeout (in seconds) for the transfer; if the transfer does
not complete within this period, an exception will be raised. not complete within this period, an exception will be raised.
.. method:: pull(self, source, dest, timeout=None) .. method:: pull(self, source, dest, timeout=None)
Transfer a file from the connected device to the host machine. Transfer a file, or files matching a glob pattern, from the connected device
to the host machine.
:param source: path of to the file on the connected device :param source: path of to the file on the connected device. If ``dest`` is a
directory, may be a glob pattern.
:param dest: path of to the file on the host :param dest: path of to the file on the host
:param timeout: timeout (in seconds) for the transfer; if the transfer does :param timeout: timeout (in seconds) for the transfer; if the transfer does
not complete within this period, an exception will be raised. not complete within this period, an exception will be raised.