← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~rockstar/launchpad/lil-recipe-bugs into lp:launchpad/devel

 

Paul Hummer has proposed merging lp:~rockstar/launchpad/lil-recipe-bugs into lp:launchpad/devel with lp:~thumper/launchpad/recipe-help as a prerequisite.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  #670413 Recipe description field too big
  https://bugs.launchpad.net/bugs/670413
  #670434 "Default Distribution series:" inconsistently capitalized on recipe creation page
  https://bugs.launchpad.net/bugs/670434
  #670436 Default distribution series on recipe creation page not explained
  https://bugs.launchpad.net/bugs/670436


This branch fixes a couple of little recipe bugs that were marked high.  These changes are the kind that don't really have tests to go along with them.
-- 
https://code.launchpad.net/~rockstar/launchpad/lil-recipe-bugs/+merge/40143
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rockstar/launchpad/lil-recipe-bugs into lp:launchpad/devel.
=== modified file 'lib/lp/code/browser/sourcepackagerecipe.py'
--- lib/lp/code/browser/sourcepackagerecipe.py	2010-10-29 00:07:20 +0000
+++ lib/lp/code/browser/sourcepackagerecipe.py	2010-11-04 19:46:17 +0000
@@ -274,10 +274,16 @@
         'build_daily',
         ])
     daily_build_archive = Choice(vocabulary='TargetPPAs',
-        title=u'Daily build archive')
+        title=u'Daily build archive',
+        description=(
+            u'If built daily, this the archive where the package '
+            u'will be uploaded.'))
     distros = List(
         Choice(vocabulary='BuildableDistroSeries'),
-        title=u'Default Distribution series')
+        title=u'Default distribution series',
+        description=(
+            u'If built daily, these are the distribution versions that '
+            u'the recipe will be built for.'))
     recipe_text = Text(
         title=u'Recipe text', required=True,
         description=u'The text of the recipe.')

=== modified file 'lib/lp/code/interfaces/sourcepackagerecipe.py'
--- lib/lp/code/interfaces/sourcepackagerecipe.py	2010-11-04 19:46:16 +0000
+++ lib/lp/code/interfaces/sourcepackagerecipe.py	2010-11-04 19:46:17 +0000
@@ -52,6 +52,7 @@
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.registry.interfaces.role import IHasOwner
 from lp.services.fields import (
+    Description,
     PersonChoice,
     PublicPersonChoice,
     )
@@ -176,7 +177,7 @@
             constraint=name_validator,
             description=_("The name of this recipe.")))
 
-    description = Text(
+    description = Description(
         title=_('Description'), required=True,
         description=_('A short description of the recipe.'))