Skip to content
Snippets Groups Projects
Commit d5d02b71 authored by Ryan Aslett (Mixologic)'s avatar Ryan Aslett (Mixologic)
Browse files

Merge branch '7.x-3.x' into 3110413-sha1-fields

parents de75d42a 4ef661ca
No related branches found
No related tags found
No related merge requests found
......@@ -116,14 +116,14 @@ class DrupalorgProjectPackageReleaseDistro extends DrupalorgProjectPackageReleas
// Package the no-core distribution.
// 'h' is for dereference, we want to include the files, not the links
if (!drush_shell_cd_and_exec($this->temp_directory, '/bin/tar -ch --owner=0 --group=0 --file=- %s | /bin/gzip -9 --no-name > %s', $this->project_short_name, $no_core_full_dest_tgz)) {
watchdog('package_error', 'Archiving failed: <pre>@output</pre>', array('@output' => implode("\n", drush_shell_exec_output())), WATCHDOG_ERROR);
watchdog('package_error', 'Archiving failed: <pre>@output</pre>', ['@output' => implode("\n", drush_shell_exec_output())], WATCHDOG_ERROR);
return 'error';
}
$files[$no_core_file_path_tgz] = 6;
@unlink($no_core_full_dest_zip);
if (!drush_shell_cd_and_exec($this->temp_directory, '/usr/bin/zip -rq %s %s', $no_core_full_dest_zip, $this->project_short_name)) {
watchdog('package_error', 'Archiving failed: <pre>@output</pre>', array('@output' => implode("\n", drush_shell_exec_output())), WATCHDOG_ERROR);
watchdog('package_error', 'Archiving failed: <pre>@output</pre>', ['@output' => implode("\n", drush_shell_exec_output())], WATCHDOG_ERROR);
return 'error';
}
$files[$no_core_file_path_zip] = 7;
......@@ -175,8 +175,8 @@ class DrupalorgProjectPackageReleaseDistro extends DrupalorgProjectPackageReleas
// Package the core distribution.
// 'h' is for dereference, we want to include the files, not the links
if (!drush_shell_cd_and_exec($this->temp_directory, '/bin/tar -ch --owner=0 --group=0 --file=- %s | %s -9 --no-name > %s', $core_build_dir, $this->conf['gzip'], $core_full_dest_tgz)) {
watchdog('package_error', 'Archiving failed: <pre>@output</pre>', array('@output' => implode("\n", drush_shell_exec_output())), WATCHDOG_ERROR);
if (!drush_shell_cd_and_exec($this->temp_directory, '/bin/tar -ch --owner=0 --group=0 --file=- %s | /bin/gzip -9 --no-name > %s', $core_build_dir, $core_full_dest_tgz)) {
watchdog('package_error', 'Archiving failed: <pre>@output</pre>', ['@output' => implode("\n", drush_shell_exec_output())], WATCHDOG_ERROR);
return 'error';
}
// We want this to float to the top, so give it the lightest weight.
......@@ -184,7 +184,7 @@ class DrupalorgProjectPackageReleaseDistro extends DrupalorgProjectPackageReleas
@unlink($core_full_dest_zip);
if (!drush_shell_cd_and_exec($this->temp_directory, '/usr/bin/zip -rq %s %s', $core_full_dest_zip, $core_build_dir)) {
watchdog('package_error', 'Archiving failed: <pre>@output</pre>', array('@output' => implode("\n", drush_shell_exec_output())), WATCHDOG_ERROR);
watchdog('package_error', 'Archiving failed: <pre>@output</pre>', ['@output' => implode("\n", drush_shell_exec_output())], WATCHDOG_ERROR);
return 'error';
}
// We want the .zip version with core to be ligher than the non-core
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment