mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
Merge branch 'task/naderman/phing-build' into develop-olympus
* task/naderman/phing-build: [task/phing-build] Correct the path for update package patch files.
This commit is contained in:
commit
0e731ca5dd
1 changed files with 4 additions and 1 deletions
|
@ -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'));
|
$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
|
// 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
|
// Now put those files determined within the correct directories
|
||||||
|
|
Loading…
Add table
Reference in a new issue