aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-11-08 00:17:47 +0100
committerAndreas Fischer <bantu@phpbb.com>2010-11-08 00:17:47 +0100
commit0e731ca5dd4db23eaf290c34bd9a7df125699b16 (patch)
tree1e39e05a46fb6bd2f88efd398e9d47c9788c919c
parent6c04e7ed800542e180f9f550a7be4938d7551d68 (diff)
parent2847b2125ed4e981174736540a70acd111bcf29c (diff)
downloadforums-0e731ca5dd4db23eaf290c34bd9a7df125699b16.tar
forums-0e731ca5dd4db23eaf290c34bd9a7df125699b16.tar.gz
forums-0e731ca5dd4db23eaf290c34bd9a7df125699b16.tar.bz2
forums-0e731ca5dd4db23eaf290c34bd9a7df125699b16.tar.xz
forums-0e731ca5dd4db23eaf290c34bd9a7df125699b16.zip
Merge branch 'task/naderman/phing-build' into develop-olympus
* task/naderman/phing-build: [task/phing-build] Correct the path for update package patch files.
-rwxr-xr-xbuild/package.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/build/package.php b/build/package.php
index 2615d983b2..4ce644e8ca 100755
--- a/build/package.php
+++ b/build/package.php
@@ -42,7 +42,10 @@ if (sizeof($package->old_packages))
$package->begin_status('Parsing patch/diff files for phpBB-' . $dest_package_filename . $package->get('new_version_number'));
// Parse this diff to determine file changes from the checked versions and save them
- $diff_file_changes[$_package_name] = $package->collect_diff_files($dest_package_filename, $_package_name);
+ $diff_file_changes[$_package_name] = $package->collect_diff_files(
+ $package->get('patch_directory') . '/phpBB-' . $dest_package_filename . $package->get('new_version_number') . '.patch',
+ $_package_name
+ );
}
// Now put those files determined within the correct directories