Linaro Android Build Tools

Merge lp:~milo/linaro-android-build-tools/bzr-fixes into lp:linaro-android-build-tools

  1. bzr-fixes
  2. Merge into trunk
Proposed by Milo Casagrande
Status: Merged
Approved by: Georgy Redkozubov
Approved revision: 575
Merged at revision: 575
Proposed branch: lp:~milo/linaro-android-build-tools/bzr-fixes
Merge into: lp:linaro-android-build-tools
Diff against target: 30 lines (+3/-3)
1 file modified
control/setup-control-node (+3/-3)
To merge this branch: bzr merge lp:~milo/linaro-android-build-tools/bzr-fixes
Reviewer Review Type Date Requested Status
Georgy Redkozubov Approve
Review via email: mp+154739@code.launchpad.net

Description of the change

Branch fixed a problem with a link pointing to the old ~linaro-infrastructure
page in Launchpad.

Removed also the use of bzr get and used bzr branch instead, since get is
deprecated in recent version of bzr.

To post a comment you must log in.
Revision history for this message
Georgy Redkozubov (gesha) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'control/setup-control-node'
2--- control/setup-control-node 2012-10-23 11:45:03 +0000
3+++ control/setup-control-node 2013-03-21 15:43:12 +0000
4@@ -231,7 +231,7 @@
5 sudo kill `sudo cat ~git-mirror/service.pid` || true
6 fi
7 sudo rm -rf linaro-android-mirror
8-bzr get lp:linaro-android-mirror
9+bzr branch lp:linaro-android-mirror
10 cd linaro-android-mirror
11 sudo -H -u git-mirror twistd -y mirror-service.tac --umask=0022 --pid ~git-mirror/service.pid --logfile ~git-mirror/service.log
12 # Should set up crontab to launch this on @restart or something
13@@ -261,7 +261,7 @@
14 sudo -H -u build-system-frontend bash -xes <<\EOF
15 cd
16 rm -rf frontend
17-bzr get http://bazaar.launchpad.net/~linaro-infrastructure/linaro-android-frontend/trunk frontend
18+bzr branch lp:linaro-android-frontend frontend
19 cd frontend
20 make
21 KEY="$(openssl rand 30 | base64 -w0)"
22@@ -293,7 +293,7 @@
23 wget -c -nv http://yui.zenfs.com/releases/yui3/yui_3.3.0.zip
24 unzip -o -q yui_3.3.0.zip
25 rm -rf lazr-js
26-bzr get lp:~mwhudson/lazr-js/combo-mod_wsgi-config lazr-js
27+bzr branch lp:~mwhudson/lazr-js/combo-mod_wsgi-config lazr-js
28 cd lazr-js
29 mkdir -p build/3.3.0
30 ln -s ~/yui/build build/3.3.0/build

Subscribers

People subscribed via source and target branches