More package clean up and removing large error messages that included
redudant commands that were listed above. Augmented error messgaes to be
more precise.
Signed-off-by: Scott Zawalski <scottz@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@2763 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/client/common_lib/packages.py b/client/common_lib/packages.py
index 9a28c16..61269b9 100644
--- a/client/common_lib/packages.py
+++ b/client/common_lib/packages.py
@@ -216,11 +216,9 @@
# checksum file
self.update_checksum(dest_path)
return
- except (PackageFetchError, error.AutoservRunError), e:
+ except (PackageFetchError, error.AutoservRunError):
# The package could not be found in this repo, continue looking
- error_msgs[location] = str(e)
- print '%s could not be fetched from - %s : %s' % (pkg_name,
- location, e)
+ print '%s could not be fetched from %s' % (pkg_name, location)
# if we got here then that means the package is not found
# in any of the repositories.
@@ -253,9 +251,10 @@
pkg_path = os.path.join(source_url, filename)
try:
self._run_command('wget -nv %s -O %s' % (pkg_path, dest_path))
- except error.CmdError, e:
- raise PackageFetchError("%s not found in %s: %s"
- % (filename, source_url, e))
+ print "Successfully fetched %s from %s" % (filename, source_url)
+ except error.CmdError:
+ raise PackageFetchError("%s not found in %s" % (filename,
+ source_url))
def run_http_test(self, source_url, dest_dir):
@@ -361,14 +360,13 @@
utils.run("ssh %s 'chmod 644 %s'" % (hostline, r_path))
except error.CmdError:
print "Error uploading to repository " + upload_path
- pass
else:
shutil.copy(file_path, upload_path)
os.chmod(os.path.join(upload_path,
os.path.basename(file_path)), 0644)
except (IOError, os.error), why:
- raise PackageUploadError("Upload of %s to %s failed: %s"
- % (file_path, upload_path, why))
+ print "Upload of %s to %s failed: %s" % (file_path, upload_path,
+ why)
def upload_pkg_dir(self, dir_path, upload_path):
@@ -391,7 +389,6 @@
utils.run("ssh %s 'chmod 644 %s'" % (hostline, ssh_path))
except error.CmdError:
print "Error uploading to repository: " + upload_path
- pass
else:
utils.run("cp %s %s " % (local_path, upload_path))
up_path = os.path.join(upload_path, "*")