Ryan Lane has submitted this change and it was merged. Change subject: Turn git-deploy mods into patches ......................................................................
Turn git-deploy mods into patches Change-Id: Ife56ae60a70e52d06198fcac8c1e5c4a1ba98edc --- M debian/changelog M debian/compat A debian/patches/no-remote.diff A debian/patches/pass-refresh.diff A debian/patches/series M debian/rules 6 files changed, 90 insertions(+), 4 deletions(-) Approvals: Ryan Lane: Verified; Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 32982dc..259382f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-deploy (6.00-wmf6) precise-wikimedia; urgency=low + + * Pass force argument to sync scripts + + -- Ryan Lane <[email protected]> Wed, 13 Dec 2012 01:34:17 +0000 + git-deploy (6.00-wmf5) precise-wikimedia; urgency=low * Add /var/lib/git-deploy directory diff --git a/debian/compat b/debian/compat index 1e8b314..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -6 +7 diff --git a/debian/patches/no-remote.diff b/debian/patches/no-remote.diff new file mode 100644 index 0000000..92f876f --- /dev/null +++ b/debian/patches/no-remote.diff @@ -0,0 +1,11 @@ +--- a/git-deploy/bin/git-deploy ++++ b/git-deploy/bin/git-deploy +@@ -350,7 +350,7 @@ + ################################################################################### + my $list_all= 0; + my $check_clean= 1; +-my $use_remote= 1; ++my $use_remote= 0; + + my %legal_action= ( + start => 'start', diff --git a/debian/patches/pass-refresh.diff b/debian/patches/pass-refresh.diff new file mode 100644 index 0000000..a6c6c0a --- /dev/null +++ b/debian/patches/pass-refresh.diff @@ -0,0 +1,68 @@ +--- a/git-deploy/bin/git-deploy ++++ b/git-deploy/bin/git-deploy +@@ -712,6 +712,7 @@ + execute_deploy_hooks( + phase => "pre-start", + prefix => $prefix, ++ force => $force, + ); + } ); # this will die if there is a problem + do_fetch($remote_site); +@@ -737,6 +738,7 @@ + execute_deploy_hooks( + phase => "pre-pull", + prefix => $prefix, ++ force => $force, + start_tag => $start_tag, + ); + _info "Pruning dead remote branches"; +@@ -769,6 +771,7 @@ + execute_deploy_hooks( + phase => $_, + prefix => $prefix, ++ force => $force, + start_tag => $start_tag, + ) for qw(post-pull post-tree-update); + $subject= "Starting live rollout of $prefix"; +@@ -849,6 +852,7 @@ + execute_deploy_hooks( + phase => "pre-sync", + prefix => $prefix, ++ force => $force, + start_tag => $start_tag, + ); + } ); +@@ -926,6 +930,7 @@ + execute_deploy_hooks( + phase => "post-sync", + prefix => $prefix, ++ force => $force, + start_tag => $start_tag, + rollout_tag => $rollout_tag, + ); +@@ -1014,6 +1019,7 @@ + execute_deploy_hooks( + phase => "post-abort", + prefix => $prefix, ++ force => $force, + ); + + unlink_rollout_status_file(); +--- a/git-deploy/lib/Git/Deploy.pm ++++ b/git-deploy/lib/Git/Deploy.pm +@@ -1436,6 +1436,7 @@ + + my $phase = $args{phase} || _die "Missing phase argument"; + my $prefix = $args{prefix} || _die "Missing prefix argument"; ++ my $force = $args{force} || 0; + my $ignore_exit_code = $args{ignore_exit_code} || 0; + + my $root= get_hook_dir( $prefix ) +@@ -1443,6 +1444,7 @@ + + local $ENV{GIT_DEPLOY_PHASE} = $phase; + local $ENV{GIT_DEPLOY_PREFIX} = $prefix; ++ local $ENV{GIT_DEPLOY_FORCED} = $force; + + # the tag information, if provided + local $ENV{GIT_DEPLOY_START_TAG} = $args{start_tag} if defined $args{start_tag}; diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..6ed4aa5 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +pass-refresh.diff +no-remote.diff diff --git a/debian/rules b/debian/rules index 89b388b..5adcbe0 100755 --- a/debian/rules +++ b/debian/rules @@ -11,8 +11,6 @@ - - configure: configure-stamp configure-stamp: dh_testdir @@ -22,6 +20,7 @@ build: build-stamp + dh_quilt_patch build-stamp: configure-stamp dh_testdir @@ -42,7 +41,7 @@ install: build dh_testdir dh_testroot - #dh_prep + dh_prep dh_installdirs # Build architecture-independent files here. -- To view, visit https://gerrit.wikimedia.org/r/38482 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ife56ae60a70e52d06198fcac8c1e5c4a1ba98edc Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/git-deploy Gerrit-Branch: master Gerrit-Owner: Ryan Lane <[email protected]> Gerrit-Reviewer: Ryan Lane <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
