mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-02 07:05:24 +00:00
Pulling out fallback patch until we can determine how we're going to stop the fallback from happening when we know we don't want it to fallback... :\ See bug 344742.
This commit is contained in:
parent
bff1af4a29
commit
99833cac0b
@ -233,26 +233,9 @@ class Patch extends AUS_Object {
|
||||
return true;
|
||||
}
|
||||
|
||||
// If our channel matches our regexp for fallback channels, let's try to fallback.
|
||||
if (preg_match('/^\w+\-cck\-\w+$/',$channel)) {
|
||||
|
||||
// Partner fallback channel to be used if the partner-specific update doesn't exist or work.
|
||||
$buf = array();
|
||||
$buf = split('-cck-',$channel);
|
||||
$fallbackChannel = $buf[0];
|
||||
|
||||
// Do a check for the fallback update. If we find a valid fallback update, we can offer it.
|
||||
if (!empty($fallbackChannel) && $this->setPath($product,$platform,$locale,$version,$build,3,$fallbackChannel) && file_exists($this->path) && filesize($this->path) > 0) {
|
||||
$this->setSnippet($this->path);
|
||||
$this->setVar('isPatch',true,true);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
// Determine the branch of the client's version.
|
||||
$branchVersion = $this->getBranch($version);
|
||||
|
||||
|
||||
// Otherwise, if it is a complete patch and a nightly channel, force the complete update to take the user to the latest build.
|
||||
if ($this->isComplete() && $this->isNightlyChannel($channel)) {
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user