diff options
| -rwxr-xr-x | tupkg/update/tupkgupdate | 17 | ||||
| -rw-r--r-- | web/lib/pkgfuncs.inc | 6 |
2 files changed, 16 insertions, 7 deletions
diff --git a/tupkg/update/tupkgupdate b/tupkg/update/tupkgupdate index d38583b9..9b85c9f8 100755 --- a/tupkg/update/tupkgupdate +++ b/tupkg/update/tupkgupdate @@ -55,17 +55,20 @@ class PackageDatabase: row = q.fetchone() return row[0] return None - def insert(self, package, locationId): - warning("DB: Inserting package: " + package.name) - category_id = lookupCategory(package.category) + def getCategoryID(self, package): + category_id = self.lookupCategory(package.category) if (category_id == None): category_id = 1 + warning("DB: Got category ID '" + str(category_id) + "' for package '" + package.name + "'") + return category_id + def insert(self, package, locationId): + warning("DB: Inserting package: " + package.name) global repo_dir q = self.cursor() q.execute("INSERT INTO Packages " + "(Name, CategoryID, Version, FSPath, LocationID, Description, URL) VALUES ('" + MySQLdb.escape_string(package.name) + "', " + - str(category_id) + ", '" + + str(self.getCategoryID(package)) + ", '" + MySQLdb.escape_string(package.new.version) + "', '" + MySQLdb.escape_string( os.path.join(repo_dir, os.path.basename(package.new.file))) + "', " + @@ -80,6 +83,7 @@ class PackageDatabase: q = self.cursor() q.execute("UPDATE Packages SET " + "Version = '" + MySQLdb.escape_string(package.new.version) + "', " + + "CategoryID = " + str(self.getCategoryID(package)) + ", " + "FSPath = '" + MySQLdb.escape_string( os.path.join(repo_dir, os.path.basename(package.new.file))) + "', " + "Description = '" + MySQLdb.escape_string(str(package.desc)) + "', " + @@ -187,8 +191,9 @@ def infoFromPackageFile(filename): def infoFromPkgbuildFile(filename): # first grab the category based on the file path - directory = os.path.dirname(os.path.abspath(filename)) - m = re.match(r".*/([^/]+)$", directory) + pkgdirectory = os.path.dirname(filename) + catdirectory = os.path.dirname(pkgdirectory) + m = re.match(r".*/([^/]+)$", catdirectory) if (m): category = m.group(1) else: diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index b5428dde..365f05ac 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -323,7 +323,11 @@ function package_details($id=0) { print "</tr>\n"; print "<tr>\n"; print " <td colspan='2'><span class='f3'>"; - print "<a href='".$row['URLPath']."'>Tarball</a> :: <a href='".dirname($row['URLPath'])."/".$row['Name']."'>Files</a></span></td>"; + if ($row["LocationID"] == 2) { + print "<a href='".$row['URLPath']."'>Tarball</a> :: <a href='".dirname($row['URLPath'])."/".$row['Name']."'>Files</a></span></td>"; + } elseif ($row["LocationID"] == 3) { + print "<a href='http://cvs.archlinux.org/cgi-bin/viewcvs.cgi/" . $row["Category"] . "/" . $row["Name"] . "/?cvsroot=AUR&only_with_tag=CURRENT'>CVS</td>"; + } print "</tr>\n"; print "<tr>\n"; print " <td colspan='2'><img src='/images/pad.gif' height='30'></td>"; |