Save md5 correctly when jhbuildPath doesn't exist yet

https://bugs.webkit.org/show_bug.cgi?id=120548

Patch by Nick Diego Yamane <nick.yamane@openbossa.org> on 2013-09-02
Reviewed by Gustavo Noronha Silva.

After r152605, Md5 for jhbuild files are saved before the update
process, this prevents the script to restart update from scratch
when initial checkouts fail. However it causes an issue when builddir
(or builddir/Dependencies) doesn't exist yet. In that case the
saveJhbuildMd5 function fails to create md5 files.
This patch adds a checking for the jhbuildPath and creates it if
necessary before trying to open the md5 files.

* Scripts/update-webkit-libs-jhbuild:
(saveJhbuildMd5):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@154951 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 72e9cfada43848410937ef10d3e8d9635bb34600..c1ab3873b7707fcc43d39aa2692c8c6cba063332 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,21 @@
+2013-09-02  Nick Diego Yamane  <nick.yamane@openbossa.org>
+
+        Save md5 correctly when jhbuildPath doesn't exist yet
+        https://bugs.webkit.org/show_bug.cgi?id=120548
+
+        Reviewed by Gustavo Noronha Silva.
+
+        After r152605, Md5 for jhbuild files are saved before the update
+        process, this prevents the script to restart update from scratch
+        when initial checkouts fail. However it causes an issue when builddir
+        (or builddir/Dependencies) doesn't exist yet. In that case the
+        saveJhbuildMd5 function fails to create md5 files.
+        This patch adds a checking for the jhbuildPath and creates it if
+        necessary before trying to open the md5 files.
+
+        * Scripts/update-webkit-libs-jhbuild:
+        (saveJhbuildMd5):
+
 2013-09-02  Mario Sanchez Prada  <mario.prada@samsung.com>
 
         Unreviewed. Move myself to the reviewers list.

diff --git a/Tools/Scripts/update-webkit-libs-jhbuild b/Tools/Scripts/update-webkit-libs-jhbuild
index 74dd7b6c5b0f698ad1b875bfc2bf99908d056611..8d4c57236b51cc0ad0acf3b0e20e8300d3ab4193 100755 (executable)
--- a/Tools/Scripts/update-webkit-libs-jhbuild
+++ b/Tools/Scripts/update-webkit-libs-jhbuild
@@ -82,9 +82,11 @@ sub jhbuildConfigurationChanged()
 
 sub saveJhbuildMd5() {
     # Save md5sum for jhbuild-related files.saveJhbuildMd5();
+    my $jhbuildPath = getJhbuildPath();
+    (-d $jhbuildPath) || mkpath $jhbuildPath;
     foreach my $file (qw(jhbuildrc jhbuild.modules)) {
         my $source = join('/', sourceDir(), "Tools", $platform, $file);
-        my $destination = join('/', getJhbuildPath(), $file);
+        my $destination = join('/', $jhbuildPath, $file);
         open(SUM, ">$destination" . ".md5sum");
         print SUM getMD5HashForFile($source);
         close(SUM);