Ticket #896: aptsource_rawurl.patch

src/lib/Server/Plugins/Packages.py

@@ -384 +384 @@
                  rawurl, blacklist, recommended):
         Source.__init__(self, basepath, url, version, arches, components, groups,
                         rawurl, blacklist, recommended)
-        self.cachefile = self.escape_url(self.url + '@' + version) + '.data'
+        if not self.rawurl:
+            self.cachefile = self.escape_url(self.url + '@' + self.version) + '.data'
+        else:
+            self.cachefile = self.escape_url(self.rawurl) + '.data'
         self.pkgnames = set()
 
     def save_state(self):
@@ -398 +401 @@
         self.pkgnames, self.deps, self.provides = cPickle.load(data)
 
     def get_urls(self):
-        return ["%sdists/%s/%s/binary-%s/Packages.gz" % \
-                (self.url, self.version, part, arch) for part in self.components \
-                for arch in self.arches]
+        if not self.rawurl:
+            return ["%sdists/%s/%s/binary-%s/Packages.gz" % \
+                    (self.url, self.version, part, arch) for part in self.components \
+                    for arch in self.arches]
+        else:
+            return ["%sPackages.gz" % (self.rawurl)]
     urls = property(get_urls)
 
-    def get_aptsrc(self):
-        return ["deb %s %s %s" % (self.url, self.version,
-                                  " ".join(self.components)),
-                "deb-src %s %s %s" % (self.url, self.version,
-                                      " ".join(self.components))]
-
     def read_files(self):
         bdeps = dict()
         bprov = dict()
@@ -417 +417 @@
         else:
             depfnames = ['Depends', 'Pre-Depends']            
         for fname in self.files:
-            barch = [x for x in fname.split('@') if x.startswith('binary-')][0][7:]
+            if not self.rawurl:
+                barch = [x for x in fname.split('@') if x.startswith('binary-')][0][7:]
+            else:
+                # RawURL entries assume that they only have one <Arch></Arch>
+                # element and that it is the architecture of the source.
+                barch = self.arches[0]
             if barch not in bdeps:
                 bdeps[barch] = dict()
                 bprov[barch] = dict()

doc/server/plugins/generators/packages.txt

@@ -147 +147 @@
       </YUMSource>
     </Sources>
 
-.. note:: There is also a RawURL syntax for specifying sources that
+.. note:: There is also a RawURL syntax for specifying APT or YUM sources that
           don't follow the conventional layout:
 
           .. code-block:: xml
@@ -171 +171 @@
                 </YUMSource>
               </Sources>
 
+          .. code-block:: xml
 
+              <Sources>
+                <APTSource>
+                  <Group>ubuntu-lucid</Group>
+                  <RawURL>http://hudson-ci.org/debian/binary</RawURL>
+                  <Arch>amd64</Arch>
+                </APTSource>
+                <APTSource>
+                  <Group>ubuntu-lucid</Group>
+                  <RawURL>http://hudson-ci.org/debian/binary</RawURL>
+                  <Arch>i386</Arch>
+                </APTSource>
+              </Sources>
+
 Configuration Updates
 =====================