launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #32765
[Merge] ~enriqueesanchz/launchpad:add-external-package into launchpad:master
Enrique Sánchez has proposed merging ~enriqueesanchz/launchpad:add-external-package into launchpad:master.
Commit message:
Add ExternalPackage model that was reverted before
We now don't use package_widget for ExternalPackage.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~enriqueesanchz/launchpad/+git/launchpad/+merge/489260
--
Your team Launchpad code reviewers is requested to review the proposed merge of ~enriqueesanchz/launchpad:add-external-package into launchpad:master.
diff --git a/lib/lp/app/widgets/launchpadtarget.py b/lib/lp/app/widgets/launchpadtarget.py
index d296589..4d05fd6 100644
--- a/lib/lp/app/widgets/launchpadtarget.py
+++ b/lib/lp/app/widgets/launchpadtarget.py
@@ -218,6 +218,12 @@ class LaunchpadTargetWidget(BrowserWidget, InputWidget):
self.default_option = "package"
self.distribution_widget.setRenderedValue(value.distribution)
self.package_widget.setRenderedValue(value.sourcepackagename)
+<<<<<<< lib/lp/app/widgets/launchpadtarget.py
+=======
+ elif IExternalPackage.providedBy(value):
+ self.default_option = "package"
+ self.distribution_widget.setRenderedValue(value.distribution)
+>>>>>>> lib/lp/app/widgets/launchpadtarget.py
else:
raise AssertionError("Not a valid value: %r" % value)