1
=== modified file 'lib/lp/archivepublisher/indices.py'
2
--- lib/lp/archivepublisher/indices.py	2014-10-31 13:28:31 +0000
3
+++ lib/lp/archivepublisher/indices.py	2016-01-12 17:05:26 +0000
4
@@ -118,8 +118,10 @@
5
118
    fields.append('Maintainer', spr.dsc_maintainer_rfc822)
118
    fields.append('Maintainer', spr.dsc_maintainer_rfc822)
6
119
    fields.append('Build-Depends', spr.builddepends)
119
    fields.append('Build-Depends', spr.builddepends)
7
120
    fields.append('Build-Depends-Indep', spr.builddependsindep)
120
    fields.append('Build-Depends-Indep', spr.builddependsindep)
8
121
    fields.append('Build-Depends-Arch', spr.builddependsarch)
9
121
    fields.append('Build-Conflicts', spr.build_conflicts)
122
    fields.append('Build-Conflicts', spr.build_conflicts)
10
122
    fields.append('Build-Conflicts-Indep', spr.build_conflicts_indep)
123
    fields.append('Build-Conflicts-Indep', spr.build_conflicts_indep)
11
124
    fields.append('Build-Conflicts-Arch', spr.build_conflicts_arch)
12
123
    fields.append('Architecture', spr.architecturehintlist)
125
    fields.append('Architecture', spr.architecturehintlist)
13
124
    fields.append('Standards-Version', spr.dsc_standards_version)
126
    fields.append('Standards-Version', spr.dsc_standards_version)
14
125
    fields.append('Format', spr.dsc_format)
127
    fields.append('Format', spr.dsc_format)
15
126
128
16
=== modified file 'lib/lp/archivepublisher/tests/test_indices.py'
17
--- lib/lp/archivepublisher/tests/test_indices.py	2014-10-31 13:05:52 +0000
18
+++ lib/lp/archivepublisher/tests/test_indices.py	2016-01-12 17:05:26 +0000
19
@@ -64,7 +64,9 @@
20
64
        """
64
        """
21
65
        pub_source = self.getPubSource(
65
        pub_source = self.getPubSource(
22
66
            builddepends='fooish', builddependsindep='pyfoo',
66
            builddepends='fooish', builddependsindep='pyfoo',
24
67
            build_conflicts='bar', build_conflicts_indep='pybar')
67
            builddependsarch='libfoo-dev',
25
68
            build_conflicts='bar', build_conflicts_indep='pybar',
26
69
            build_conflicts_arch='libbar-dev')
27
68
70
28
69
        self.assertEqual(
71
        self.assertEqual(
29
70
            [u'Package: foo',
72
            [u'Package: foo',
30
@@ -74,8 +76,10 @@
31
74
             u'Maintainer: Foo Bar <foo@bar.com>',
76
             u'Maintainer: Foo Bar <foo@bar.com>',
32
75
             u'Build-Depends: fooish',
77
             u'Build-Depends: fooish',
33
76
             u'Build-Depends-Indep: pyfoo',
78
             u'Build-Depends-Indep: pyfoo',
34
79
             u'Build-Depends-Arch: libfoo-dev',
35
77
             u'Build-Conflicts: bar',
80
             u'Build-Conflicts: bar',
36
78
             u'Build-Conflicts-Indep: pybar',
81
             u'Build-Conflicts-Indep: pybar',
37
82
             u'Build-Conflicts-Arch: libbar-dev',
38
79
             u'Architecture: all',
83
             u'Architecture: all',
39
80
             u'Standards-Version: 3.6.2',
84
             u'Standards-Version: 3.6.2',
40
81
             u'Format: 1.0',
85
             u'Format: 1.0',
41
@@ -99,7 +103,9 @@
42
99
        """
103
        """
43
100
        pub_source = self.getPubSource(
104
        pub_source = self.getPubSource(
44
101
            builddepends='fooish', builddependsindep='pyfoo',
105
            builddepends='fooish', builddependsindep='pyfoo',
45
106
            builddependsarch='libfoo-dev',
46
102
            build_conflicts='bar', build_conflicts_indep='pybar',
107
            build_conflicts='bar', build_conflicts_indep='pybar',
47
108
            build_conflicts_arch='libbar-dev',
48
103
            user_defined_fields=[
109
            user_defined_fields=[
49
104
                ("Python-Version", "< 1.5"),
110
                ("Python-Version", "< 1.5"),
50
105
                ("CHECKSUMS-SHA1", "BLAH")])
111
                ("CHECKSUMS-SHA1", "BLAH")])
51
@@ -112,8 +118,10 @@
52
112
             u'Maintainer: Foo Bar <foo@bar.com>',
118
             u'Maintainer: Foo Bar <foo@bar.com>',
53
113
             u'Build-Depends: fooish',
119
             u'Build-Depends: fooish',
54
114
             u'Build-Depends-Indep: pyfoo',
120
             u'Build-Depends-Indep: pyfoo',
55
121
             u'Build-Depends-Arch: libfoo-dev',
56
115
             u'Build-Conflicts: bar',
122
             u'Build-Conflicts: bar',
57
116
             u'Build-Conflicts-Indep: pybar',
123
             u'Build-Conflicts-Indep: pybar',
58
124
             u'Build-Conflicts-Arch: libbar-dev',
59
117
             u'Architecture: all',
125
             u'Architecture: all',
60
118
             u'Standards-Version: 3.6.2',
126
             u'Standards-Version: 3.6.2',
61
119
             u'Format: 1.0',
127
             u'Format: 1.0',
62
120
128
63
=== modified file 'lib/lp/archiveuploader/dscfile.py'
64
--- lib/lp/archiveuploader/dscfile.py	2015-07-30 07:46:08 +0000
65
+++ lib/lp/archiveuploader/dscfile.py	2016-01-12 17:05:26 +0000
66
@@ -661,8 +661,10 @@
67
661
            maintainer=self.maintainer['person'],
661
            maintainer=self.maintainer['person'],
68
662
            builddepends=encoded.get('Build-Depends', ''),
662
            builddepends=encoded.get('Build-Depends', ''),
69
663
            builddependsindep=encoded.get('Build-Depends-Indep', ''),
663
            builddependsindep=encoded.get('Build-Depends-Indep', ''),
70
664
            builddependsarch=encoded.get('Build-Depends-Arch', ''),
71
664
            build_conflicts=encoded.get('Build-Conflicts', ''),
665
            build_conflicts=encoded.get('Build-Conflicts', ''),
72
665
            build_conflicts_indep=encoded.get('Build-Conflicts-Indep', ''),
666
            build_conflicts_indep=encoded.get('Build-Conflicts-Indep', ''),
73
667
            build_conflicts_arch=encoded.get('Build-Conflicts-Arch', ''),
74
666
            architecturehintlist=encoded.get('Architecture', ''),
668
            architecturehintlist=encoded.get('Architecture', ''),
75
667
            creator=self.changes.changed_by['person'],
669
            creator=self.changes.changed_by['person'],
76
668
            urgency=self.changes.converted_urgency,
670
            urgency=self.changes.converted_urgency,
77
669
671
78
=== modified file 'lib/lp/archiveuploader/tests/nascentupload.txt'
79
--- lib/lp/archiveuploader/tests/nascentupload.txt	2015-12-30 23:34:34 +0000
80
+++ lib/lp/archiveuploader/tests/nascentupload.txt	2016-01-12 17:05:26 +0000
81
@@ -373,12 +373,18 @@
82
373
    >>> ed_spr.builddependsindep
373
    >>> ed_spr.builddependsindep
83
374
    u''
374
    u''
84
375
375
85
376
    >>> ed_spr.builddependsarch
86
377
    u''
87
378
88
376
    >>> ed_spr.build_conflicts
379
    >>> ed_spr.build_conflicts
89
377
    u'foo-bar'
380
    u'foo-bar'
90
378
381
91
379
    >>> ed_spr.build_conflicts_indep
382
    >>> ed_spr.build_conflicts_indep
92
380
    u'biscuit'
383
    u'biscuit'
93
381
384
94
385
    >>> ed_spr.build_conflicts_arch
95
386
    u''
96
387
97
382
The content of 'debian/copyright' is stored as the 'copyright'
388
The content of 'debian/copyright' is stored as the 'copyright'
98
383
attribute of SourcePackageRelease (note that its content is filtered
389
attribute of SourcePackageRelease (note that its content is filtered
99
384
with encoding.guess()).
390
with encoding.guess()).
100
385
391
101
=== modified file 'lib/lp/registry/browser/sourcepackage.py'
102
--- lib/lp/registry/browser/sourcepackage.py	2015-10-01 17:32:41 +0000
103
+++ lib/lp/registry/browser/sourcepackage.py	2016-01-12 17:05:26 +0000
104
@@ -520,6 +520,11 @@
105
520
            self.context.currentrelease.builddependsindep)
520
            self.context.currentrelease.builddependsindep)
106
521
521
107
522
    @property
522
    @property
108
523
    def builddependsarch(self):
109
524
        return self._relationship_parser(
110
525
            self.context.currentrelease.builddependsarch)
111
526
112
527
    @property
113
523
    def build_conflicts(self):
528
    def build_conflicts(self):
114
524
        return self._relationship_parser(
529
        return self._relationship_parser(
115
525
            self.context.currentrelease.build_conflicts)
530
            self.context.currentrelease.build_conflicts)
116
@@ -529,6 +534,11 @@
117
529
        return self._relationship_parser(
534
        return self._relationship_parser(
118
530
            self.context.currentrelease.build_conflicts_indep)
535
            self.context.currentrelease.build_conflicts_indep)
119
531
536
120
537
    @property
121
538
    def build_conflicts_arch(self):
122
539
        return self._relationship_parser(
123
540
            self.context.currentrelease.build_conflicts_arch)
124
541
125
532
    def requestCountry(self):
542
    def requestCountry(self):
126
533
        return ICountry(self.request, None)
543
        return ICountry(self.request, None)
127
534
544
128
535
545
129
=== modified file 'lib/lp/registry/interfaces/distroseries.py'
130
--- lib/lp/registry/interfaces/distroseries.py	2015-10-13 13:22:08 +0000
131
+++ lib/lp/registry/interfaces/distroseries.py	2016-01-12 17:05:26 +0000
132
@@ -646,13 +646,13 @@
133
646
646
134
647
    def createUploadedSourcePackageRelease(
647
    def createUploadedSourcePackageRelease(
135
648
        sourcepackagename, version, maintainer, builddepends,
648
        sourcepackagename, version, maintainer, builddepends,
143
649
        builddependsindep, architecturehintlist, component, creator, urgency,
649
        builddependsindep, builddependsarch, architecturehintlist,
144
650
        changelog, changelog_entry, dsc, dscsigningkey, section,
650
        component, creator, urgency, changelog, changelog_entry, dsc,
145
651
        dsc_maintainer_rfc822, dsc_standards_version, dsc_format,
651
        dscsigningkey, section, dsc_maintainer_rfc822,
146
652
        dsc_binaries, archive, copyright, build_conflicts,
652
        dsc_standards_version, dsc_format, dsc_binaries, archive, copyright,
147
653
        build_conflicts_indep, dateuploaded=None,
653
        build_conflicts, build_conflicts_indep, build_conflicts_arch,
148
654
        source_package_recipe_build=None, user_defined_fields=None,
654
        dateuploaded=None, source_package_recipe_build=None,
149
655
        homepage=None):
655
        user_defined_fields=None, homepage=None):
150
656
        """Create an uploads `SourcePackageRelease`.
656
        """Create an uploads `SourcePackageRelease`.
151
657
657
152
658
        Set this distroseries set to be the uploadeddistroseries.
658
        Set this distroseries set to be the uploadeddistroseries.
153
@@ -678,9 +678,12 @@
154
678
         :param builddepends: string, DSC build dependencies
678
         :param builddepends: string, DSC build dependencies
155
679
         :param builddependsindep: string, DSC architecture independent build
679
         :param builddependsindep: string, DSC architecture independent build
156
680
                                   dependencies.
680
                                   dependencies.
157
681
         :param builddependsarch: string, DSC architecture dependent build
158
682
                                  dependencies.
159
681
         :param build_conflicts: string, DSC Build-Conflicts content
683
         :param build_conflicts: string, DSC Build-Conflicts content
160
682
         :param build_conflicts_indep: string, DSC Build-Conflicts-Indep
684
         :param build_conflicts_indep: string, DSC Build-Conflicts-Indep
161
683
                                       content
685
                                       content
162
686
         :param build_conflicts_arch: string, DSC Build-Conflicts-Arch content
163
684
         :param dsc_maintainer_rfc822: string, DSC maintainer field
687
         :param dsc_maintainer_rfc822: string, DSC maintainer field
164
685
         :param dsc_standards_version: string, DSC standards version field
688
         :param dsc_standards_version: string, DSC standards version field
165
686
         :param dsc_format: string, DSC format version field
689
         :param dsc_format: string, DSC format version field
166
687
690
167
=== modified file 'lib/lp/registry/model/distroseries.py'
168
--- lib/lp/registry/model/distroseries.py	2015-12-15 14:12:25 +0000
169
+++ lib/lp/registry/model/distroseries.py	2016-01-12 17:05:26 +0000
170
@@ -1142,11 +1142,11 @@
171
1142
1142
172
1143
    def createUploadedSourcePackageRelease(
1143
    def createUploadedSourcePackageRelease(
173
1144
        self, sourcepackagename, version, maintainer, builddepends,
1144
        self, sourcepackagename, version, maintainer, builddepends,
177
1145
        builddependsindep, architecturehintlist, component, creator,
1145
        builddependsindep, builddependsarch, architecturehintlist, component,
178
1146
        urgency, changelog, changelog_entry, dsc, dscsigningkey, section,
1146
        creator, urgency, changelog, changelog_entry, dsc, dscsigningkey,
179
1147
        dsc_maintainer_rfc822, dsc_standards_version, dsc_format,
1147
        section, dsc_maintainer_rfc822, dsc_standards_version, dsc_format,
180
1148
        dsc_binaries, archive, copyright, build_conflicts,
1148
        dsc_binaries, archive, copyright, build_conflicts,
182
1149
        build_conflicts_indep, dateuploaded=DEFAULT,
1149
        build_conflicts_indep, build_conflicts_arch, dateuploaded=DEFAULT,
183
1150
        source_package_recipe_build=None, user_defined_fields=None,
1150
        source_package_recipe_build=None, user_defined_fields=None,
184
1151
        homepage=None):
1151
        homepage=None):
185
1152
        """See `IDistroSeries`."""
1152
        """See `IDistroSeries`."""
186
@@ -1154,6 +1154,7 @@
187
1154
            upload_distroseries=self, sourcepackagename=sourcepackagename,
1154
            upload_distroseries=self, sourcepackagename=sourcepackagename,
188
1155
            version=version, maintainer=maintainer, dateuploaded=dateuploaded,
1155
            version=version, maintainer=maintainer, dateuploaded=dateuploaded,
189
1156
            builddepends=builddepends, builddependsindep=builddependsindep,
1156
            builddepends=builddepends, builddependsindep=builddependsindep,
190
1157
            builddependsarch=builddependsarch,
191
1157
            architecturehintlist=architecturehintlist, component=component,
1158
            architecturehintlist=architecturehintlist, component=component,
192
1158
            creator=creator, urgency=urgency, changelog=changelog,
1159
            creator=creator, urgency=urgency, changelog=changelog,
193
1159
            changelog_entry=changelog_entry, dsc=dsc,
1160
            changelog_entry=changelog_entry, dsc=dsc,
194
@@ -1164,6 +1165,7 @@
195
1164
            dsc_format=dsc_format, dsc_binaries=dsc_binaries,
1165
            dsc_format=dsc_format, dsc_binaries=dsc_binaries,
196
1165
            build_conflicts=build_conflicts,
1166
            build_conflicts=build_conflicts,
197
1166
            build_conflicts_indep=build_conflicts_indep,
1167
            build_conflicts_indep=build_conflicts_indep,
198
1168
            build_conflicts_arch=build_conflicts_arch,
199
1167
            source_package_recipe_build=source_package_recipe_build,
1169
            source_package_recipe_build=source_package_recipe_build,
200
1168
            user_defined_fields=user_defined_fields, homepage=homepage)
1170
            user_defined_fields=user_defined_fields, homepage=homepage)
201
1169
1171
202
1170
1172
203
=== modified file 'lib/lp/registry/templates/sourcepackage-index.pt'
204
--- lib/lp/registry/templates/sourcepackage-index.pt	2015-11-24 01:44:28 +0000
205
+++ lib/lp/registry/templates/sourcepackage-index.pt	2016-01-12 17:05:26 +0000
206
@@ -124,6 +124,12 @@
207
124
                  <tal:block tal:condition="relationships/has_items"
124
                  <tal:block tal:condition="relationships/has_items"
208
125
                             replace="structure relationships/@@+render-list"/>
125
                             replace="structure relationships/@@+render-list"/>
209
126
              </td>
126
              </td>
210
127
              <td id="dependsarch"
211
128
                  tal:define="relationships view/builddependsarch">
212
129
                  <h3>Platform-dependent build dependencies</h3>
213
130
                  <tal:block tal:condition="relationships/has_items"
214
131
                             replace="structure relationships/@@+render-list"/>
215
132
              </td>
216
127
          </tr>
133
          </tr>
217
128
          <tr>
134
          <tr>
218
129
              <td id="conflicts" tal:define="relationships view/build_conflicts">
135
              <td id="conflicts" tal:define="relationships view/build_conflicts">
219
@@ -137,6 +143,12 @@
220
137
                  <tal:block tal:condition="relationships/has_items"
143
                  <tal:block tal:condition="relationships/has_items"
221
138
                             replace="structure relationships/@@+render-list"/>
144
                             replace="structure relationships/@@+render-list"/>
222
139
              </td>
145
              </td>
223
146
              <td id="conflictsarch"
224
147
                  tal:define="relationships view/build_conflicts_arch">
225
148
                  <h3>Platform-dependent build dependencies</h3>
226
149
                  <tal:block tal:condition="relationships/has_items"
227
150
                             replace="structure relationships/@@+render-list"/>
228
151
              </td>
229
140
          </tr>
152
          </tr>
230
141
        </table>
153
        </table>
231
142
      </div>
154
      </div>
232
143
155
233
=== modified file 'lib/lp/soyuz/doc/package-relationship.txt'
234
--- lib/lp/soyuz/doc/package-relationship.txt	2015-07-29 16:55:28 +0000
235
+++ lib/lp/soyuz/doc/package-relationship.txt	2016-01-12 17:05:26 +0000
236
@@ -1,12 +1,16 @@
237
1
= Package Relationship Model =
1
= Package Relationship Model =
238
2
2
239
3
We call "package relationship" the DSC field which describes relation
3
We call "package relationship" the DSC field which describes relation
241
4
between the package in question and others availble:
4
between the package in question and others available:
242
5
5
243
6
For sources DSC provides:
6
For sources DSC provides:
244
7
7
245
8
 * builddepends
8
 * builddepends
246
9
 * builddependsindep
9
 * builddependsindep
247
10
 * builddependsarch
248
11
 * build_conflicts
249
12
 * build_conflicts_indep
250
13
 * build_conflicts_arch
251
10
14
252
11
For binaries we have:
15
For binaries we have:
253
12
16
254
13
17
255
=== modified file 'lib/lp/soyuz/doc/sourcepackagerelease.txt'
256
--- lib/lp/soyuz/doc/sourcepackagerelease.txt	2014-07-14 16:47:15 +0000
257
+++ lib/lp/soyuz/doc/sourcepackagerelease.txt	2016-01-12 17:05:26 +0000
258
@@ -143,6 +143,7 @@
259
143
  >>> archhintlist = 'any'
143
  >>> archhintlist = 'any'
260
144
  >>> builddepends = 'cdbs, debhelper (>= 4.1.0), libsysfs-dev, libhal-dev'
144
  >>> builddepends = 'cdbs, debhelper (>= 4.1.0), libsysfs-dev, libhal-dev'
261
145
  >>> builddependsindep = ''
145
  >>> builddependsindep = ''
262
146
  >>> builddependsarch = ''
263
146
  >>> dsc_maintainer_rfc822 = 'Foo Bar <foo@bar.com>'
147
  >>> dsc_maintainer_rfc822 = 'Foo Bar <foo@bar.com>'
264
147
  >>> dsc_standards_version = '2.6.1'
148
  >>> dsc_standards_version = '2.6.1'
265
148
  >>> dsc_format = '1.0'
149
  >>> dsc_format = '1.0'
266
@@ -155,11 +156,12 @@
267
155
156
268
156
  >>> new_spr = hoary.createUploadedSourcePackageRelease(
157
  >>> new_spr = hoary.createUploadedSourcePackageRelease(
269
157
  ...     arg_name, version, arg_maintainer,
158
  ...     arg_name, version, arg_maintainer,
274
158
  ...     builddepends, builddependsindep, archhintlist, arg_comp, arg_creator,
159
  ...     builddepends, builddependsindep, builddependsarch, archhintlist,
275
159
  ...     arg_urgency, changelog, changelog_entry, dsc, arg_key, arg_sect,
160
  ...     arg_comp, arg_creator, arg_urgency, changelog, changelog_entry, dsc,
276
160
  ...     dsc_maintainer_rfc822, dsc_standards_version, dsc_format,
161
  ...     arg_key, arg_sect, dsc_maintainer_rfc822, dsc_standards_version,
277
161
  ...     dsc_binaries, archive, copyright=copyright,
162
  ...     dsc_format, dsc_binaries, archive, copyright=copyright,
278
162
  ...     build_conflicts=None, build_conflicts_indep=None,
163
  ...     build_conflicts=None, build_conflicts_indep=None,
279
164
  ...     build_conflicts_arch=None,
280
163
  ...     source_package_recipe_build=arg_recipebuild)
165
  ...     source_package_recipe_build=arg_recipebuild)
281
164
166
282
165
  >>> new_spr.upload_distroseries.name
167
  >>> new_spr.upload_distroseries.name
283
166
168
284
=== modified file 'lib/lp/soyuz/interfaces/sourcepackagerelease.py'
285
--- lib/lp/soyuz/interfaces/sourcepackagerelease.py	2015-09-28 17:38:45 +0000
286
+++ lib/lp/soyuz/interfaces/sourcepackagerelease.py	2016-01-12 17:05:26 +0000
287
@@ -50,10 +50,15 @@
288
50
                      "package depends to build"),
50
                      "package depends to build"),
289
51
        required=False)
51
        required=False)
290
52
    builddependsindep = TextLine(
52
    builddependsindep = TextLine(
292
53
        title=_("DSC build depends"),
53
        title=_("DSC arch-independent build depends"),
293
54
        description=_("Same as builddepends, but the list is of "
54
        description=_("Same as builddepends, but the list is of "
294
55
                      "arch-independent packages"),
55
                      "arch-independent packages"),
295
56
        required=False)
56
        required=False)
296
57
    builddependsarch = TextLine(
297
58
        title=_("DSC arch-dependent build depends"),
298
59
        description=_("Same as builddepends, but the list is of "
299
60
                      "arch-dependent packages"),
300
61
        required=False)
301
57
    build_conflicts = TextLine(
62
    build_conflicts = TextLine(
302
58
        title=_("DSC build conflicts"),
63
        title=_("DSC build conflicts"),
303
59
        description=_("Binaries that will conflict when building this "
64
        description=_("Binaries that will conflict when building this "
304
@@ -64,6 +69,11 @@
305
64
        description=_("Same as build-conflicts but only lists "
69
        description=_("Same as build-conflicts but only lists "
306
65
                      "arch-independent binaries."),
70
                      "arch-independent binaries."),
307
66
        required=False)
71
        required=False)
308
72
    build_conflicts_arch = TextLine(
309
73
        title=_("DSC arch-dependent build conflicts"),
310
74
        description=_("Same as build-conflicts but only lists "
311
75
                      "arch-dependent binaries."),
312
76
        required=False)
313
67
    architecturehintlist = TextLine(
77
    architecturehintlist = TextLine(
314
68
        title=_("Architecture Hint List"),
78
        title=_("Architecture Hint List"),
315
69
        description=_(
79
        description=_(
316
70
80
317
=== modified file 'lib/lp/soyuz/model/sourcepackagerelease.py'
318
--- lib/lp/soyuz/model/sourcepackagerelease.py	2015-11-20 17:57:46 +0000
319
+++ lib/lp/soyuz/model/sourcepackagerelease.py	2016-01-12 17:05:26 +0000
320
@@ -99,8 +99,10 @@
321
99
    changelog_entry = StringCol(dbName='changelog_entry')
99
    changelog_entry = StringCol(dbName='changelog_entry')
322
100
    builddepends = StringCol(dbName='builddepends')
100
    builddepends = StringCol(dbName='builddepends')
323
101
    builddependsindep = StringCol(dbName='builddependsindep')
101
    builddependsindep = StringCol(dbName='builddependsindep')
324
102
    builddependsarch = StringCol(dbName='builddependsarch')
325
102
    build_conflicts = StringCol(dbName='build_conflicts')
103
    build_conflicts = StringCol(dbName='build_conflicts')
326
103
    build_conflicts_indep = StringCol(dbName='build_conflicts_indep')
104
    build_conflicts_indep = StringCol(dbName='build_conflicts_indep')
327
105
    build_conflicts_arch = StringCol(dbName='build_conflicts_arch')
328
104
    architecturehintlist = StringCol(dbName='architecturehintlist')
106
    architecturehintlist = StringCol(dbName='architecturehintlist')
329
105
    homepage = StringCol(dbName='homepage')
107
    homepage = StringCol(dbName='homepage')
330
106
    format = EnumCol(dbName='format', schema=SourcePackageType,
108
    format = EnumCol(dbName='format', schema=SourcePackageType,
331
107
109
332
=== modified file 'lib/lp/soyuz/scripts/gina/handlers.py'
333
--- lib/lp/soyuz/scripts/gina/handlers.py	2015-05-20 11:31:11 +0000
334
+++ lib/lp/soyuz/scripts/gina/handlers.py	2016-01-12 17:05:26 +0000
335
@@ -624,8 +624,10 @@
336
624
            changelog_entry=src.changelog_entry,
624
            changelog_entry=src.changelog_entry,
337
625
            builddepends=src.build_depends,
625
            builddepends=src.build_depends,
338
626
            builddependsindep=src.build_depends_indep,
626
            builddependsindep=src.build_depends_indep,
339
627
            builddependsarch=src.build_depends_arch,
340
627
            build_conflicts=src.build_conflicts,
628
            build_conflicts=src.build_conflicts,
341
628
            build_conflicts_indep=src.build_conflicts_indep,
629
            build_conflicts_indep=src.build_conflicts_indep,
342
630
            build_conflicts_arch=src.build_conflicts_arch,
343
629
            architecturehintlist=src.architecture,
631
            architecturehintlist=src.architecture,
344
630
            format=SourcePackageType.DPKG,
632
            format=SourcePackageType.DPKG,
345
631
            upload_distroseries=distroseries.id,
633
            upload_distroseries=distroseries.id,
346
632
634
347
=== modified file 'lib/lp/soyuz/scripts/gina/packages.py'
348
--- lib/lp/soyuz/scripts/gina/packages.py	2015-12-07 21:49:16 +0000
349
+++ lib/lp/soyuz/scripts/gina/packages.py	2016-01-12 17:05:26 +0000
350
@@ -277,8 +277,10 @@
351
277
    # Defaults, potentially overwritten by __init__
277
    # Defaults, potentially overwritten by __init__
352
278
    build_depends = ""
278
    build_depends = ""
353
279
    build_depends_indep = ""
279
    build_depends_indep = ""
354
280
    build_depends_arch = ""
355
280
    build_conflicts = ""
281
    build_conflicts = ""
356
281
    build_conflicts_indep = ""
282
    build_conflicts_indep = ""
357
283
    build_conflicts_arch = ""
358
282
    standards_version = ""
284
    standards_version = ""
359
283
    section = None
285
    section = None
360
284
    format = None
286
    format = None
361
285
287
362
=== modified file 'lib/lp/soyuz/stories/soyuz/xx-distroseries-sources.txt'
363
--- lib/lp/soyuz/stories/soyuz/xx-distroseries-sources.txt	2015-11-30 04:18:39 +0000
364
+++ lib/lp/soyuz/stories/soyuz/xx-distroseries-sources.txt	2016-01-12 17:05:26 +0000
365
@@ -118,12 +118,12 @@
366
118
  ...     'http://launchpad.dev/ubuntu/breezy-autotest/+source/'
118
  ...     'http://launchpad.dev/ubuntu/breezy-autotest/+source/'
367
119
  ...     'commercialpackage')
119
  ...     'commercialpackage')
368
120
120
372
121
PackageRelationships, 'builddepends', 'builddependsindep',
121
PackageRelationships, 'builddepends', 'builddependsindep', 'builddependsarch',
373
122
'build_conflicts' and 'build_conflicts_indep' for the source in
122
'build_conflicts', 'build_conflicts_indep', and 'build_conflicts_arch' for the
374
123
question are provided in this page.
123
source in question are provided in this page.
375
124
124
378
125
Even when the relationshipt section is empty they are presented,
125
Even when the relationship section is empty they are presented,
379
126
keeping the page format contant.
126
keeping the page format constant.
380
127
127
381
128
  >>> depends_section = find_tag_by_id(browser.contents, 'depends')
128
  >>> depends_section = find_tag_by_id(browser.contents, 'depends')
382
129
  >>> parse_relationship_section(str(depends_section))
129
  >>> parse_relationship_section(str(depends_section))
383
@@ -133,6 +133,10 @@
384
133
  >>> parse_relationship_section(str(dependsindep_section))
133
  >>> parse_relationship_section(str(dependsindep_section))
385
134
  EMPTY SECTION
134
  EMPTY SECTION
386
135
135
387
136
  >>> dependsarch_section = find_tag_by_id(browser.contents, 'dependsarch')
388
137
  >>> parse_relationship_section(str(dependsarch_section))
389
138
  EMPTY SECTION
390
139
391
136
  >>> conflicts_section = find_tag_by_id(browser.contents, 'conflicts')
140
  >>> conflicts_section = find_tag_by_id(browser.contents, 'conflicts')
392
137
  >>> parse_relationship_section(str(conflicts_section))
141
  >>> parse_relationship_section(str(conflicts_section))
393
138
  EMPTY SECTION
142
  EMPTY SECTION
394
@@ -142,6 +146,11 @@
395
142
  >>> parse_relationship_section(str(conflictsindep_section))
146
  >>> parse_relationship_section(str(conflictsindep_section))
396
143
  EMPTY SECTION
147
  EMPTY SECTION
397
144
148
398
149
  >>> conflictsarch_section = find_tag_by_id(
399
150
  ...     browser.contents, 'conflictsarch')
400
151
  >>> parse_relationship_section(str(conflictsarch_section))
401
152
  EMPTY SECTION
402
153
403
145
Let's inspect a page with non-empty relationships.
154
Let's inspect a page with non-empty relationships.
404
146
155
405
147
  >>> browser.open(
156
  >>> browser.open(
406
@@ -163,6 +172,10 @@
407
163
  LINK: "pmount" -> http://launchpad.dev/ubuntu/warty/+package/pmount
172
  LINK: "pmount" -> http://launchpad.dev/ubuntu/warty/+package/pmount
408
164
  TEXT: "postgresql-client (&gt;= 7.4)"
173
  TEXT: "postgresql-client (&gt;= 7.4)"
409
165
174
410
175
  >>> dependsarch_section = find_tag_by_id(browser.contents, 'dependsarch')
411
176
  >>> parse_relationship_section(str(dependsarch_section))
412
177
  EMPTY SECTION
413
178
414
166
  >>> conflicts_section = find_tag_by_id(browser.contents, 'conflicts')
179
  >>> conflicts_section = find_tag_by_id(browser.contents, 'conflicts')
415
167
  >>> parse_relationship_section(str(conflicts_section))
180
  >>> parse_relationship_section(str(conflicts_section))
416
168
  TEXT: "gcc-4.0"
181
  TEXT: "gcc-4.0"
417
@@ -174,6 +187,11 @@
418
174
  TEXT: "gcc-4.0-base"
187
  TEXT: "gcc-4.0-base"
419
175
  LINK: "pmount" -> http://launchpad.dev/ubuntu/warty/+package/pmount
188
  LINK: "pmount" -> http://launchpad.dev/ubuntu/warty/+package/pmount
420
176
189
421
190
  >>> conflictsarch_section = find_tag_by_id(
422
191
  ...     browser.contents, 'conflictsarch')
423
192
  >>> parse_relationship_section(str(conflictsarch_section))
424
193
  EMPTY SECTION
425
194
426
177
195
427
178
The '+changelog' page provides an aggregation of the changelogs for
196
The '+changelog' page provides an aggregation of the changelogs for
428
179
SourcePackageReleases published in this DistroSeries.
197
SourcePackageReleases published in this DistroSeries.
429
180
198
430
=== modified file 'lib/lp/soyuz/tests/test_publishing.py'
431
--- lib/lp/soyuz/tests/test_publishing.py	2015-10-05 22:21:17 +0000
432
+++ lib/lp/soyuz/tests/test_publishing.py	2016-01-12 17:05:26 +0000
433
@@ -191,10 +191,11 @@
434
191
                     urgency=SourcePackageUrgency.LOW,
191
                     urgency=SourcePackageUrgency.LOW,
435
192
                     scheduleddeletiondate=None, dateremoved=None,
192
                     scheduleddeletiondate=None, dateremoved=None,
436
193
                     distroseries=None, archive=None, builddepends=None,
193
                     distroseries=None, archive=None, builddepends=None,
438
194
                     builddependsindep=None, architecturehintlist='all',
194
                     builddependsindep=None, builddependsarch=None,
439
195
                     architecturehintlist='all',
440
195
                     dsc_standards_version='3.6.2', dsc_format='1.0',
196
                     dsc_standards_version='3.6.2', dsc_format='1.0',
441
196
                     dsc_binaries='foo-bin', build_conflicts=None,
197
                     dsc_binaries='foo-bin', build_conflicts=None,
443
197
                     build_conflicts_indep=None,
198
                     build_conflicts_indep=None, build_conflicts_arch=None,
444
198
                     dsc_maintainer_rfc822='Foo Bar <foo@bar.com>',
199
                     dsc_maintainer_rfc822='Foo Bar <foo@bar.com>',
445
199
                     maintainer=None, creator=None, date_uploaded=UTC_NOW,
200
                     maintainer=None, creator=None, date_uploaded=UTC_NOW,
446
200
                     spr_only=False, user_defined_fields=None):
201
                     spr_only=False, user_defined_fields=None):
447
@@ -231,8 +232,10 @@
448
231
            version=version,
232
            version=version,
449
232
            builddepends=builddepends,
233
            builddepends=builddepends,
450
233
            builddependsindep=builddependsindep,
234
            builddependsindep=builddependsindep,
451
235
            builddependsarch=builddependsarch,
452
234
            build_conflicts=build_conflicts,
236
            build_conflicts=build_conflicts,
453
235
            build_conflicts_indep=build_conflicts_indep,
237
            build_conflicts_indep=build_conflicts_indep,
454
238
            build_conflicts_arch=build_conflicts_arch,
455
236
            architecturehintlist=architecturehintlist,
239
            architecturehintlist=architecturehintlist,
456
237
            changelog=None,
240
            changelog=None,
457
238
            changelog_entry=None,
241
            changelog_entry=None,
458
239
242
459
=== modified file 'lib/lp/testing/factory.py'
460
--- lib/lp/testing/factory.py	2016-01-11 21:11:27 +0000
461
+++ lib/lp/testing/factory.py	2016-01-12 17:05:26 +0000
462
@@ -3575,9 +3575,10 @@
463
3575
                                 creator=None, component=None,
3575
                                 creator=None, component=None,
464
3576
                                 section_name=None, urgency=None,
3576
                                 section_name=None, urgency=None,
465
3577
                                 version=None, builddepends=None,
3577
                                 version=None, builddepends=None,
467
3578
                                 builddependsindep=None,
3578
                                 builddependsindep=None, builddependsarch=None,
468
3579
                                 build_conflicts=None,
3579
                                 build_conflicts=None,
469
3580
                                 build_conflicts_indep=None,
3580
                                 build_conflicts_indep=None,
470
3581
                                 build_conflicts_arch=None,
471
3581
                                 architecturehintlist='all',
3582
                                 architecturehintlist='all',
472
3582
                                 dsc_maintainer_rfc822=None,
3583
                                 dsc_maintainer_rfc822=None,
473
3583
                                 dsc_standards_version='3.6.2',
3584
                                 dsc_standards_version='3.6.2',
474
@@ -3643,8 +3644,10 @@
475
3643
            version=version,
3644
            version=version,
476
3644
            builddepends=builddepends,
3645
            builddepends=builddepends,
477
3645
            builddependsindep=builddependsindep,
3646
            builddependsindep=builddependsindep,
478
3647
            builddependsarch=builddependsarch,
479
3646
            build_conflicts=build_conflicts,
3648
            build_conflicts=build_conflicts,
480
3647
            build_conflicts_indep=build_conflicts_indep,
3649
            build_conflicts_indep=build_conflicts_indep,
481
3650
            build_conflicts_arch=build_conflicts_arch,
482
3648
            architecturehintlist=architecturehintlist,
3651
            architecturehintlist=architecturehintlist,
483
3649
            changelog=changelog,
3652
            changelog=changelog,
484
3650
            changelog_entry=changelog_entry,
3653
            changelog_entry=changelog_entry,
Reviewer	Review Type	Date Requested	Status
Colin Watson (community)			Disapprove on 2016-02-05
Review via email: mp+282345@code.launchpad.net