|
@@ -1737,6 +1737,15 @@ class Packager:
|
|
|
for a given host, for instance. Returns the newly-created
|
|
for a given host, for instance. Returns the newly-created
|
|
|
HostEntry object."""
|
|
HostEntry object."""
|
|
|
|
|
|
|
|
|
|
+ scheme = URLSpec(host).getScheme()
|
|
|
|
|
+ if scheme == 'https' and downloadUrl is None:
|
|
|
|
|
+ # If we specified an SSL-protected host URL, but no
|
|
|
|
|
+ # explicit download URL, then assume the download URL is
|
|
|
|
|
+ # the same, over cleartext.
|
|
|
|
|
+ url = URLSpec(host)
|
|
|
|
|
+ url.setScheme('http')
|
|
|
|
|
+ downloadUrl = url.getUrl()
|
|
|
|
|
+
|
|
|
he = self.hosts.get(host, None)
|
|
he = self.hosts.get(host, None)
|
|
|
if he is None:
|
|
if he is None:
|
|
|
# Define a new host entry
|
|
# Define a new host entry
|
|
@@ -2688,6 +2697,10 @@ class Packager:
|
|
|
processing. """
|
|
processing. """
|
|
|
|
|
|
|
|
self.hosts = {}
|
|
self.hosts = {}
|
|
|
|
|
+ # Since we've blown away the self.hosts map, we have to make
|
|
|
|
|
+ # sure that our own host at least is added to the map.
|
|
|
|
|
+ self.addHost(self.host)
|
|
|
|
|
+
|
|
|
self.contents = {}
|
|
self.contents = {}
|
|
|
self.contentsChanged = False
|
|
self.contentsChanged = False
|
|
|
|
|
|
|
@@ -2713,10 +2726,6 @@ class Packager:
|
|
|
self.contents[pe.getKey()] = pe
|
|
self.contents[pe.getKey()] = pe
|
|
|
xpackage = xpackage.NextSiblingElement('package')
|
|
xpackage = xpackage.NextSiblingElement('package')
|
|
|
|
|
|
|
|
- # Since we've blown away the self.hosts map, we have to make
|
|
|
|
|
- # sure that our own host at least is added to the map.
|
|
|
|
|
- self.addHost(self.host)
|
|
|
|
|
-
|
|
|
|
|
def writeContentsFile(self):
|
|
def writeContentsFile(self):
|
|
|
""" Rewrites the contents.xml file at the end of
|
|
""" Rewrites the contents.xml file at the end of
|
|
|
processing. """
|
|
processing. """
|