Fix adding of variants to catalog property-list

maintain_catalog.py

@@ -22,6 +22,10 @@ parser.add_argument("--no-update",
      dest = "noupdate",
      help="Disable updating from SCM source",
      action="store_true")
+parser.add_argument("--no-upload",
+     dest = "noupload",
+     help="Disable uploading to destination server",
+     action="store_true")
 parser.add_argument("dir", help="Catalog directory")
 args = parser.parse_args()
 
@@ -75,7 +79,7 @@ def initRepositories():
     return repositories
 
 def processUpload(node, outputPath):
-    if not node.getValue("enabled", True):
+    if args.noupload or not node.getValue("enabled", True):
         print "Upload disabled"
         return
 

package.py

@@ -15,16 +15,28 @@ class VariantData:
         #self._primary = primary
         self._path = path
         self._name = node.getValue("sim/description")
+        if (not self._name):
+            print "Missing description for " + path
+            self._name = "Missing description:" + self.id
 
         # ratings
 
         # seperate thumbnails
 
+    @property
+    def name(self):
+        return self._name
+
+    @property
+    def id(self):
+        return self._path[:-8] # "remove -set.xml" (8 chars)
+
     @property
     def catalogNode(self):
         n = sgprops.Node("variant")
-        n.addChild("id").value = self._path[:-8] # "remove -set.xml" (8 chars)
+        n.addChild("id").value = self.id
-        n.addChild("name").value = self._name
+        n.addChild("name").value = self.name
+        return n
 
 class PackageData:
     def __init__(self, path, scmRepo):