Merge lp:~evarlast/charms/precise/juju-gui/hacking-note into lp:~juju-gui/charms/trusty/juju-gui/trunk
Proposed by
Jay R. Wren
Status: | Merged |
---|---|
Merged at revision: | 186 |
Proposed branch: | lp:~evarlast/charms/precise/juju-gui/hacking-note |
Merge into: | lp:~juju-gui/charms/trusty/juju-gui/trunk |
Diff against target: |
53 lines (+27/-1) 2 files modified
HACKING.md (+26/-0) hooks/utils.py (+1/-1) |
To merge this branch: | bzr merge lp:~evarlast/charms/precise/juju-gui/hacking-note |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju GUI Hackers | Pending | ||
Review via email: mp+226194@code.launchpad.net |
Description of the change
update HACKING.md
note that ppa stable is required
New devs might assume that ppa:juju/devel subsumes ppa:juju/stable.
Note that it does not.
add Proposing Branches section to document use of lbox
To post a comment you must log in.
Reviewers: mp+226194_ code.launchpad. net,
Message:
Please take a look.
Description:
update HACKING.md
note that ppa stable is required
New devs might assume that ppa:juju/devel subsumes ppa:juju/stable.
Note that it does not.
add Proposing Branches section to document use of lbox
https:/ /code.launchpad .net/~evarlast/ charms/ precise/ juju-gui/ hacking- note/+merge/ 226194
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/107690044/
Affected files (+29, -1 lines):
M HACKING.md
A [revision details]
M hooks/utils.py
Index: HACKING.md
=== modified file 'HACKING.md'
--- HACKING.md 2014-04-22 10:28:39 +0000
+++ HACKING.md 2014-07-09 18:38:56 +0000
@@ -42,6 +42,8 @@
sudo apt-get update
sudo apt-get install charm-tools
+Note that **ppa:juju/devel does NOT subsume ppa:juju/stable. You must add
ppa:juju/stable**.
+
Before being able to run the suite, test requirements need to be installed
running the command:
@@ -257,3 +259,27 @@
following in the Juju GUI machine:
service guiserver restart launchpad. net/lbox) to propose branches for review blog.labix. org/2011/ 11/17/launchpad -rietveld- happycodereview s) /codereview. appspot. com, your google credentials /www.google. com/accounts/ ClientLogin (You don't goetveld_ codereview. appspot. com . This
+
+## Proposing Branches ##
+
+We use [lbox](http://
+and submit them to the trunk. Gustavo Niemeyer has
+[a helpful
blogpost](http://
+about this tool.
+
+To install lbox make sure you GOPATH is set and run go get
launchpad.net/lbox.
+
+On first run lbox will attempt to launch sensible-browser or failing that
+$BROWSER to obtain oauth credentials to launchpad. This is stored to
+$HOME/.lpad_oath . You may want to chmod 0600 this file if your umask is
more
+open by default.
+
+Next, to post to https:/
are
+requested. This uses https:/
+have to worry about plain text password over internet.) Cookies and oauth
+credentials get stored at $HOME/.
time
+the file should default to mode 0600, but you can double check for your own
+security sanity.
+
+To post a review, bzr push to
lp:~YOURNAME/charms/trusty/juju-gui/BRANCHNAME and
+run lbox propose.
Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>
Index: hooks/utils.py
'openssl' , 'req', '-new', '-newkey', 'rsa:4096',
'-days' , '365', '-nodes', '-x509', '-subj', ST=Juju/ L=GUI/O= Ubuntu/ CN=juju. ubuntu. com', ST=Juju/ L=GUI/O= Ubuntu/ CN=your- jujugui. local',
'-keyout' , key_path, '-out', crt_path)) join(ssl_ cert_path, JUJU_PEM)
=== modified file 'hooks/utils.py'
--- hooks/utils.py 2014-04-15 09:38:31 +0000
+++ hooks/utils.py 2014-07-08 15:52:13 +0000
@@ -747,7 +747,7 @@
# These are arbitrary test values for the certificate.
- '/C=GB/
+ '/C=GB/
# Generate the pem file.
pem_path = os.path.