367802 - patcher2 needs to use MozBuild::Util

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[J. Paul Reed [:preed]]

MozAUSLib.pm contains cloned functions that are now available in MozBuild::Util.pm.

The version in MozBuild::Util are better tested and are the ones we should be using.

Also, MozAUSLib::DownloadFile should move to MozBuild::Util.

Comment 1

[J. Paul Reed [:preed]]

Attachment: Take 1

This patch does a whole bunch of things:

-- Removes the --move-update functionality, since we don't use it, I don't recommend it be used, and it's likely broken anyway
-- Convert a bunch of copied code that makes sure our deliverable dir exists to a single function (EnsureDeliverableDir())
-- Remove from MozAUSLib: MkdirWithPath(), RunShellCommand(), DownloadFile(); use MozBuild::Util versions (in the case of DownloadFile(), *move* it to MozBuild::Util)
-- Convert all RunShellCommand() calls to MozBuild::Util's calling convention
-- Make the default deliverable directory name be what it's always been ("temp" not "output")
-- Convert path concatenations to catfile()
-- variablize the snippet dir names
-- Remove hash_file; use MozBuild::Util's HashFile; convert MozBuild::Util::HashFile() to the new RunShellCommand() calling convention
-- In MozBuild::Util::MkdirWithPath, accept "mask" as an argument
-- In MozBuild::Util::HashFile, ignore case on the specification of the hash

Comment 2

[J. Paul Reed [:preed]]

Attachment: Take 2

Same as Take 1, except change how we handle the specification of the checksum type to be saner.

One thing I should've mentioned is I'm doing a test run now by generating Firefox's 1.5.0.8 -> 1.5.0.9 patches; so far, so good, but it's still running.

Comment 3

[J. Paul Reed [:preed]]

Checking in patcher2.pl;
/cvsroot/mozilla/tools/patcher/patcher2.pl,v  <--  patcher2.pl
new revision: 1.14; previous revision: 1.13
done
Checking in MozAUSConfig.pm;
/cvsroot/mozilla/tools/patcher/MozAUSConfig.pm,v  <--  MozAUSConfig.pm
new revision: 1.6; previous revision: 1.5
done
Checking in MozAUSLib.pm;
/cvsroot/mozilla/tools/patcher/MozAUSLib.pm,v  <--  MozAUSLib.pm
new revision: 1.4; previous revision: 1.3
done
Checking in MozBuild/Util.pm;
/cvsroot/mozilla/tools/release/MozBuild/Util.pm,v  <--  Util.pm
new revision: 1.9; previous revision: 1.8
done


Landed.