Merge lp:~abentley/launchpad/force-aptitude into lp:launchpad
Status: | Merged |
---|---|
Merged at revision: | 11215 |
Proposed branch: | lp:~abentley/launchpad/force-aptitude |
Merge into: | lp:launchpad |
Diff against target: |
85 lines (+22/-7) 3 files modified
lib/canonical/buildd/buildrecipe (+18/-4) lib/canonical/buildd/test_buildd_recipe (+1/-1) utilities/soyuz-sampledata-setup.py (+3/-2) |
To merge this branch: | bzr merge lp:~abentley/launchpad/force-aptitude |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
LaMont Jones (community) | packaging | Approve | |
Paul Hummer (community) | code | Approve | |
Review via email: mp+30795@code.launchpad.net |
Description of the change
= Summary =
Fix bug #599102 Source build based on recipe targeting Maverick fails
== Proposed fix ==
Add aptitude to the list of packages to install, because pbuilder's scripts
need it but the package doesn't depend on it.
== Pre-implementation notes ==
Mid-implementation discussion with Lamont.
== Implementation details ==
Also made some changes to make this kind of fix easier to test, updating the
test script to use Maverick, and adding Maverick to the soyuz-sampledat
script.
Also improved logging by displaying the recipe being built and the command
being run.
Also updated the sudo command to specify -i so that it behaves more like the
user.
== Tests ==
None (but it has been interactively tested on dogfood.)
== Demo and Q/A ==
Request a recipe build targetting Maverick. It should not die due to lack of
aptitude.
= Launchpad lint =
Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.
Linting changed files:
utilities/
lib/canonical
lib/canonical
== Pylint notices ==
C
1: Invalid name "soyuz-
E
33: No name 'component' in module 'zope'
F
33: Unable to import 'zope.component'
E
35: No name 'lifecycleevent' in module 'zope'
F
35: Unable to import 'zope.lifecycle
E
36: No name 'security' in module 'zope'
F
36: Unable to import 'zope.security.
C
65: Invalid name "user_name" (should match (([A-Z_
66: Invalid name "default_email" (should match (([A-Z_
145:
285:clean_up: Missing docstring
W
307:
312:populate: Unused argument 'options'
363:
349:
C
389:main: Missing docstring
W
390:main: Unused variable 'args'
Report
======
191 statements analysed.
Duplication
-----------
+--
| |now |previous |difference |
+==
|nb duplicated lines |0 |NC |NC |
+--
|percent duplicated lines |0.000 |NC |NC |
+--
Raw metrics
-----------
+--
|type |number |% |previous |difference |
+==
|code |243 |66.21 |NC |NC |
+--
|docstring |60 |16.35 |NC |NC |
+--
|comment |22 |5.99 |NC |NC |
+--
|empty |42 |11.44 |NC |NC |
+--
External dependencies
---
~~:
:
_pythonpath (soyuz-
canonical
-database
| -sqlbase
| -sqlvalues (soyuz-
-launchpad
| -interfaces
| | -launchpad
| | -ILaunchpadCele
| -scripts
| | -execute_
| | -logger
| | -logger (soyuz-
| | -logger_options (soyuz-
| -webapp
| -interfaces
| -IStoreSelector (soyuz-
| -MAIN_STORE (soyuz-
| -MASTER_FLAVOR (soyuz-
| -SLAVE_FLAVOR (soyuz-
-lp
-initZopeless (soyuz-
lp
-registry
| -interfaces
| | -codeofconduct
| | | -ISignedCodeOfC
| | -person
| | | -IPersonSet (soyuz-
| | -series
| | -SeriesStatus (soyuz-
| -model
| -codeofconduct
| -SignedCodeOfCo
-soyuz
| -interfaces
| | -component
| | | -IComponentSet (soyuz-
| | -processor
| | | -IProcessorFami
| | -publishing
| | | -active_
| | -section
| | | -ISectionSet (soyuz-
| | -sourcepackagef
| | -ISourcePackage
| | -SourcePackageF
| -model
| -component
| | -ComponentSelection (soyuz-
| -distroarchseries
| | -DistroArchSeries (soyuz-
| -section
| -SectionSelection (soyuz-
-testing
-factory
-LaunchpadO
optparse
-OptionParser (soyuz-
storm
-store
-Store (soyuz-
textwrap
-dedent (soyuz-
transaction (soyuz-
zope
-event
-notify (soyuz-
Statistics by type
---
+--
|type |number |old number |difference |%documented |%badname |
+==
|module |1 |NC |NC |100.00 |100.00 |
+--
|class |1 |NC |NC |100.00 |0.00 |
+--
|method |0 |NC |NC |0.00 |0.00 |
+--
|function |22 |NC |NC |90.91 |4.55 |
+--
Messages by category
---
+--
|type |number |previous |difference |
+==
|convention |6 |NC |NC |
+--
|refactor |0 |NC |NC |
+--
|warning |6 |NC |NC |
+--
|error |3 |NC |NC |
+--
Messages
--------
+--
|message id |occurrences |
+==
|C0103 |4 |
+--
|F0401 |3 |
+--
|E0611 |3 |
+--
|W0613 |2 |
+--
|W0612 |2 |
+--
|C0111 |2 |
+--
|W0622 |1 |
+--
|W0611 |1 |
+--
Global evaluation
---
Your code has been rated at 8.59/10
rockstar> abentley, line 26-27 of the diff, why are you printing "Printing recipe:" and the recipe on separate lines?
<abentley> rockstar, I'm printing 'Building recipe:' so to help break up the recipe from the body of the log. I'm printing the recipe verbatim so that it's easy to copy and paste.
<rockstar> abentley, okay.