summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2008-01-12 18:40:48 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2008-01-12 18:40:48 +0000
commitad27c240d742f409b6300c6e5dcf1046189f1388 (patch)
tree8c676e5f5146c8a2b46c2d260949f98e6bda0add
parentdd92fb24249198bea7e0afe4488162f5fa91f1e4 (diff)
downloadbitbake-ad27c240d742f409b6300c6e5dcf1046189f1388.tar.gz
wget.py: Change the wget fetcher failure handling to avoid lockfile problems
-rw-r--r--ChangeLog1
-rw-r--r--lib/bb/fetch/wget.py6
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ffd515dd..109cc788e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -90,6 +90,7 @@ Changes in Bitbake 1.9.x:
- Fix shell showdata command (#3259)
- Fix shell data updating problems (#1880)
- Properly raise errors for invalid source URI protocols
+ - Change the wget fetcher failure handling to avoid lockfile problems
Changes in Bitbake 1.8.0:
- Release 1.7.x as a stable series
diff --git a/lib/bb/fetch/wget.py b/lib/bb/fetch/wget.py
index 2d590ad0b..f8ade45da 100644
--- a/lib/bb/fetch/wget.py
+++ b/lib/bb/fetch/wget.py
@@ -66,10 +66,10 @@ class Wget(Fetch):
if ret != 0:
return False
- # check if sourceforge did send us to the mirror page
+ # Sanity check since wget can pretend it succeed when it didn't
+ # Also, this used to happen if sourceforge sent us to the mirror page
if not os.path.exists(ud.localpath):
- os.system("rm %s*" % ud.localpath) # FIXME shell quote it
- bb.msg.debug(2, bb.msg.domain.Fetcher, "sourceforge.net send us to the mirror on %s" % ud.basename)
+ bb.msg.debug(2, bb.msg.domain.Fetcher, "The fetch command for %s returned success but %s doesn't exist?..." % (uri, ud.localpath))
return False
return True