Merge remote branch 'autotest-upstream/master' into autotest-merge

client/common_lib/base_packages.py

 """
 This module defines the BasePackageManager Class which provides an
 implementation of the packaging system API providing methods to fetch,
 upload and remove packages. Site specific extensions to any of these methods
 should inherit this class.
 """
 
 import re, os, sys, traceback, subprocess, shutil, time, traceback, urlparse
 import fcntl, logging
 from autotest_lib.client.common_lib import error, utils, global_config
@@ skipping 10 matching lines @@
     '''
 
     match = re.search('^ssh://(.*?)(/.*)$', repo)
     if match:
         return match.groups()
     else:
         raise error.PackageUploadError(
             "Incorrect SSH path in global_config: %s" % repo)
 
 
-def repo_run_command(repo, cmd, ignore_status=False):
+def repo_run_command(repo, cmd, ignore_status=False, cd=True):
     """Run a command relative to the repos path"""
     repo = repo.strip()
     run_cmd = None
+    cd_str = ''
     if repo.startswith('ssh://'):
         username = None
         hostline, remote_path = parse_ssh_path(repo)
+        if cd:
+            cd_str = 'cd %s && ' % remote_path
         if '@' in hostline:
             username, host = hostline.split('@')
-            run_cmd = 'ssh %s@%s "cd %s && %s"' % (username, host,
-                                                   remote_path, cmd)
+            run_cmd = 'ssh %s@%s "%s%s"' % (username, host, cd_str, cmd)
         else:
-            run_cmd = 'ssh %s "cd %s && %s"' % (host, remote_path, cmd)
+            run_cmd = 'ssh %s "%s%s"' % (host, cd_str, cmd)
 
     else:
-        run_cmd = "cd %s && %s" % (repo, cmd)
+        if cd:
+            cd_str = 'cd %s && ' % repo
+        run_cmd = "%s%s" % (cd_str, cmd)
 
     if run_cmd:
         return utils.run(run_cmd, ignore_status=ignore_status)
 
 
+def create_directory(repo):
+    _, remote_path = parse_ssh_path(repo)
+    repo_run_command(repo, 'mkdir -p %s' % remote_path, cd=False)
+
+
 def check_diskspace(repo, min_free=None):
     # Note: 1 GB = 10**9 bytes (SI unit).
     if not min_free:
         min_free = global_config.global_config.get_config_value('PACKAGES',
                                                           'minimum_free_space',
                                                           type=int)
     try:
         df = repo_run_command(repo,
                               'df -PB %d . | tail -1' % 10**9).stdout.split()
         free_space_gb = int(df[3])
@@ skipping 203 matching lines @@
 
     def repo_check(self, repo):
         '''
         Check to make sure the repo is in a sane state:
         ensure we have at least XX amount of free space
         Make sure we can write to the repo
         '''
         if not repo.startswith('/') and not repo.startswith('ssh:'):
             return
         try:
+             # without comment out this, we lost the ability to package into
+             # local directories. -- ericli
+#            create_directory(repo)
             check_diskspace(repo)
             check_write(repo)
         except (error.RepoWriteError, error.RepoUnknownError,
                 error.RepoDiskFullError), e:
             raise error.RepoError("ERROR: Repo %s: %s" % (repo, e))
 
 
     def upkeep(self, custom_repos=None):
         '''
         Clean up custom upload/download areas
@@ skipping 569 matching lines @@
         if not match:
             return ('', url)
         group, filename = match.groups()
         # Generate the group prefix.
         group = re.sub(r'\W', '_', group)
         # Drop the extension to get the raw test name.
         testname = re.sub(r'\.tar\.bz2', '', filename)
         # Drop any random numbers at the end of the test name if any
         testname = re.sub(r'\.(\d*)', '', testname)
         return (group, testname)