From 72c49604c143f03d81f706100c60ae7a4208253e Mon Sep 17 00:00:00 2001 From: Zoltan Kuscsik Date: Fri, 20 Jan 2017 12:22:41 +0100 Subject: [PATCH 1/2] Fix URL for gmock Remove outdated URL for gmock 1.7 package --- external/gmock/SConscript.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/gmock/SConscript.py b/external/gmock/SConscript.py index 12f0912..bf4307f 100644 --- a/external/gmock/SConscript.py +++ b/external/gmock/SConscript.py @@ -33,7 +33,7 @@ def dir_offset_from_current(subdir): src_dir= 'gmock-1.7.0/' tar_file = 'gmock-1.7.0.zip' -tar_url = 'https://googlemock.googlecode.com/files/gmock-1.7.0.zip' +tar_url = 'https://src.fedoraproject.org/repo/pkgs/gmock/gmock-1.7.0.zip/073b984d8798ea1594f5e44d85b20d66/gmock-1.7.0.zip' if not os.path.exists(tar_file): target_zip = gmock_env.URLDownload(tar_file, tar_url) From 5b44aec385e4f5bec10018db1662ce4a836d1b1e Mon Sep 17 00:00:00 2001 From: Zoltan Kuscsik Date: Fri, 20 Jan 2017 12:23:45 +0100 Subject: [PATCH 2/2] Remove visited() method from URLDownload Fix build issue with scons 2.4.1-1 on Ubuntu 16.04. Nodieinfo has no timestamp field causing the downloads to fail. --- build_common/tools/URLDownload.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/build_common/tools/URLDownload.py b/build_common/tools/URLDownload.py index 724ad4d..e9c5392 100644 --- a/build_common/tools/URLDownload.py +++ b/build_common/tools/URLDownload.py @@ -59,17 +59,6 @@ def make_ready(self) : except Exception, e : raise SCons.Errors.StopError( '%s [%s]' % (e, self.value) ) - def visited(self) : - ninfo = self.get_ninfo() - - if self.url_etag : - ninfo.csig = self.url_etag - if self.url_last_modified : - ninfo.timestamp = self.url_last_modified - if self.url_content_length : - ninfo.size = self.url_content_length - SCons.Node.Node.visited(self); - def changed_since_last_build(self, target, prev_ni): if prev_ni : if self.url_etag :