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
1=== modified file 'bzr-super-replay.rb'
2--- bzr-super-replay.rb 2012-11-28 12:57:34 +0000
3+++ bzr-super-replay.rb 2012-12-07 10:50:42 +0000
4@@ -19,12 +19,8 @@
5 #
6 #########################################################################
7
8-require "chef/mixin/shell_out"
9-include Chef::Mixin::ShellOut
10-
11
12 STEP = 500
13-BRANCH = "lp:c2c-addons/6.1 "
14
15 help_message = "
16 Command
17@@ -146,7 +142,7 @@
18 rev_number.each do |rev, message, committer, time|
19 revno = rev*'.'
20 puts "\nreplaying revno #{revno}"
21- message += "\n(#{BRANCH} rev #{revno})"
22+ message += "\n(#{from_path} rev #{revno})"
23 puts "commit message : #{message}"
24
25 err = ""
26@@ -154,7 +150,7 @@
27 # `rm -rf *`
28 `bzr whoami "#{committer}"`
29 # Comment : on veut pas écraser les commit existant...
30- r = shell_out!("bzr revert --r=#{revno}", :cwd => from_path)
31+ `cd #{from_path};bzr revert --r=#{revno}`
32
33 oe_modules.each do |mod|
34 `cp -rf #{from_path}/#{mod} .`
35@@ -167,4 +163,4 @@
36 `bzr commit -m "#{message}" --commit-time="#{time}"`
37 end
38
39-`bzr whoami #{original_whoami}`
40\ No newline at end of file
41+`bzr whoami #{original_whoami}`

Subscribers

People subscribed via source and target branches