Merge remote branch 'cros/upstream' into master.

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 32 matching lines @@
             run_cmd = 'ssh %s "cd %s && %s"' % (host, remote_path, cmd)
 
     else:
         run_cmd = "cd %s && %s" % (repo, cmd)
 
     if run_cmd:
         return utils.run(run_cmd, ignore_status=ignore_status)
 
 
 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 -mP . | tail -1').stdout.split()
-        free_space_gb = int(df[3])/1000.0
+        df = repo_run_command(repo,
+                              'df -PB %d . | tail -1' % 10**9).stdout.split()
+        free_space_gb = int(df[3])
     except Exception, e:
         raise error.RepoUnknownError('Unknown Repo Error: %s' % e)
     if free_space_gb < min_free:
         raise error.RepoDiskFullError('Not enough disk space available '
                                       '%sg < %sg' % (free_space_gb, min_free))
 
 
 def check_write(repo):
     try:
         repo_testfile = '.repo_test_file'
@@ skipping 782 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)