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

target: Add support for as_root to get_directory method.

Browse Source
This commit is contained in:
Marc Bonnici 2018-01-08 14:06:32 +00:00 committed by setrofim
parent 30257456ab
commit f0b58b32c4
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devlib/target.py
View File

@ -297,7 +297,7 @@ class Target(object):
self.conn.pull(device_tempfile, dest, timeout=timeout) self.conn.pull(device_tempfile, dest, timeout=timeout)
self.execute("rm -r '{}'".format(device_tempfile), as_root=True) self.execute("rm -r '{}'".format(device_tempfile), as_root=True)
def get_directory(self, source_dir, dest): def get_directory(self, source_dir, dest, as_root=False):
""" Pull a directory from the device, after compressing dir """ """ Pull a directory from the device, after compressing dir """
# Create all file names # Create all file names
tar_file_name = source_dir.lstrip(self.path.sep).replace(self.path.sep, '.') tar_file_name = source_dir.lstrip(self.path.sep).replace(self.path.sep, '.')
@ -307,12 +307,16 @@ class Target(object):
tar_file_name = '{}.tar'.format(tar_file_name) tar_file_name = '{}.tar'.format(tar_file_name)
tempfile = os.path.join(dest, tar_file_name) tempfile = os.path.join(dest, tar_file_name)
# If root is required, use tmp location for tar creation.
if as_root:
tar_file_name = self.path.join(self._file_transfer_cache, tar_file_name)
# Does the folder exist? # Does the folder exist?
self.execute('ls -la {}'.format(source_dir)) self.execute('ls -la {}'.format(source_dir), as_root=as_root)
# Try compressing the folder # Try compressing the folder
try: try:
self.execute('{} tar -cvf {} {}'.format(self.busybox, tar_file_name, self.execute('{} tar -cvf {} {}'.format(self.busybox, tar_file_name,
source_dir)) source_dir), as_root=as_root)
except TargetError: except TargetError:
self.logger.debug('Failed to run tar command on target! ' \ self.logger.debug('Failed to run tar command on target! ' \
'Not pulling directory {}'.format(source_dir)) 'Not pulling directory {}'.format(source_dir))