Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch to allow for release and nightly build data directory structures to differ. See bug 342797.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@207322 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mike.morgan%oregonstate.edu 2006-08-14 17:06:17 +00:00
parent 9caa55b430
commit fa901163ec
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/webtools/aus/xml/inc/patch.class.php
View File

@ -168,11 +168,8 @@ class Patch extends AUS_Object {
*/
function findPatch($product,$platform,$locale,$version,$build,$channel=null) {
// Determine the branch of the client's version.
$branchVersion = $this->getBranch($version);
// If a specific update exists for the specified channel, it takes priority over the branch update.
if (!empty($channel) && $this->setPath($product,$platform,$locale,$branchVersion,$build,3,$channel) && file_exists($this->path) && filesize($this->path) > 0) {
if (!empty($channel) && $this->setPath($product,$platform,$locale,$version,$build,3,$channel) && file_exists($this->path) && filesize($this->path) > 0) {
$this->setSnippet($this->path);
$this->setVar('isPatch',true,true);
return true;
@ -187,13 +184,17 @@ class Patch extends AUS_Object {
$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,$branchVersion,$build,3,$fallbackChannel) && file_exists($this->path) && filesize($this->path) > 0) {
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)) {