Merge lp:~pexego/bazaar-extractor/delete_chef_dependencies into lp:bazaar-extractor

Proposed by Omar (Pexego)
Status: Merged
Merged at revision: 6
Proposed branch: lp:~pexego/bazaar-extractor/delete_chef_dependencies
Merge into: lp:bazaar-extractor
Diff against target: 41 lines (+3/-7)
1 file modified
bzr-super-replay.rb (+3/-7)
To merge this branch: bzr merge lp:~pexego/bazaar-extractor/delete_chef_dependencies
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp no test, review Approve
Alexandre Fayolle - camptocamp code review, no test Approve
Review via email: mp+138692@code.launchpad.net

Description of the change

Deletes dependencies of chef

To post a comment you must log in.
Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

LGTM

review: Approve (code review, no test)
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

Looks fine

review: Approve (no test, review)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bzr-super-replay.rb'
--- bzr-super-replay.rb 2012-11-28 12:57:34 +0000
+++ bzr-super-replay.rb 2012-12-07 10:50:42 +0000
@@ -19,12 +19,8 @@
19#19#
20#########################################################################20#########################################################################
2121
22require "chef/mixin/shell_out"
23include Chef::Mixin::ShellOut
24
2522
26STEP = 50023STEP = 500
27BRANCH = "lp:c2c-addons/6.1 "
2824
29help_message = "25help_message = "
30Command26Command
@@ -146,7 +142,7 @@
146rev_number.each do |rev, message, committer, time|142rev_number.each do |rev, message, committer, time|
147 revno = rev*'.'143 revno = rev*'.'
148 puts "\nreplaying revno #{revno}"144 puts "\nreplaying revno #{revno}"
149 message += "\n(#{BRANCH} rev #{revno})"145 message += "\n(#{from_path} rev #{revno})"
150 puts "commit message : #{message}"146 puts "commit message : #{message}"
151147
152 err = ""148 err = ""
@@ -154,7 +150,7 @@
154 # `rm -rf *`150 # `rm -rf *`
155 `bzr whoami "#{committer}"`151 `bzr whoami "#{committer}"`
156 # Comment : on veut pas écraser les commit existant...152 # Comment : on veut pas écraser les commit existant...
157 r = shell_out!("bzr revert --r=#{revno}", :cwd => from_path)153 `cd #{from_path};bzr revert --r=#{revno}`
158 154
159 oe_modules.each do |mod|155 oe_modules.each do |mod|
160 `cp -rf #{from_path}/#{mod} .`156 `cp -rf #{from_path}/#{mod} .`
@@ -167,4 +163,4 @@
167 `bzr commit -m "#{message}" --commit-time="#{time}"`163 `bzr commit -m "#{message}" --commit-time="#{time}"`
168end164end
169165
170`bzr whoami #{original_whoami}`
171\ No newline at end of file166\ No newline at end of file
167`bzr whoami #{original_whoami}`

Subscribers

People subscribed via source and target branches