1
0
Fork 0

Fix zip-name specification in packages

This commit is contained in:
James Turner 2015-09-27 23:15:44 -05:00
parent b11fae7f37
commit 6f54db6d76
2 changed files with 7 additions and 3 deletions

View file

@ -25,6 +25,7 @@ parser.add_argument("--no-update",
parser.add_argument("dir", help="Catalog directory")
args = parser.parse_args()
CATALOG_VERSION = 4
includePaths = []
packages = {}
@ -184,8 +185,7 @@ else:
catalogNode = sgprops.Node("catalog")
sgprops.copy(config.getChild("template"), catalogNode)
# version 3 catalog
catalogNode.getChild("catalog-version", create = True).value = 3
catalogNode.getChild("catalog-version", create = True).value = CATALOG_VERSION
mirrorUrls = list(m.value for m in config.getChildren("mirror"))
packagesToGenerate = []

View file

@ -199,8 +199,12 @@ class PackageData:
self._node.getChild("revision", create = True).value = int(self._revision)
self._node.getChild("scm-revision", create = True).value = self.scmRevision
baseName = os.path.basename(self.path)
self._node.getChild("dir", create = True).value = baseName
zipName = baseName + ".zip"
for m in mirrorUrls:
self._node.addChild("url").value = m + "/" + self.id + ".zip"
self._node.addChild("url").value = m + "/" + zipName
for t in self._thumbnails:
self._node.addChild("thumbnail-path").value = t