Merge remote branch 'origin/upstream' into tempbranch

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 134 matching lines @@
             file_exists = self.run_command(
                 'ls %s' % dest_path,
                 _run_command_dargs={'ignore_status': True}).exit_status == 0
             if not file_exists:
                 logging.error('wget failed: %s', result)
                 raise error.CmdError(cmd, result)
 
             logging.debug('Successfully fetched %s from %s', filename,
                           package_url)
         except error.CmdError:
+            # remove whatever junk was retrieved when the get failed
+            self.run_command('rm -f %s' % dest_path)
+
             raise error.PackageFetchError('%s not found in %s' % (filename,
                                                                   package_url))
 
 
 class LocalFilesystemFetcher(RepositoryFetcher):
     def __init__(self, package_manager, local_dir):
         self.run_command = package_manager._run_command
         self.url = local_dir
 
 
@@ skipping 671 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)