external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed several bugs

Browse source
This commit is contained in:
pjmattal 2005-02-23 05:06:41 +00:00
parent aa8135655a
commit dde20ef6bb
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
tupkg/update/tupkgupdate
View file

@ -63,9 +63,10 @@ class PackageDatabase:
MySQLdb.escape_string(package.name) + "', '" + MySQLdb.escape_string(package.name) + "', '" +
MySQLdb.escape_string(package.new.version) + "', '" + MySQLdb.escape_string(package.new.version) + "', '" +
MySQLdb.escape_string( MySQLdb.escape_string(
os.path.join(repo_dir, os.path.basename(package.new.file))) + "', '" + os.path.join(repo_dir, os.path.basename(package.new.file))) + "', " +
str(locationId) + ", '" +
MySQLdb.escape_string(str(package.desc)) + "', '" + MySQLdb.escape_string(str(package.desc)) + "', '" +
MySQLdb.escape_string(str(package.url)) + "', 3)") MySQLdb.escape_string(str(package.url)) + "')")
id = self.lookup(package.name) id = self.lookup(package.name)
self.insertNewInfo(package, id, locationId) self.insertNewInfo(package, id, locationId)
def update(self, id, package, locationId): def update(self, id, package, locationId):
@ -97,6 +98,8 @@ class PackageDatabase:
if (retval != None): if (retval != None):
return retval return retval
self.createDummy(packagename, locationId) self.createDummy(packagename, locationId)
retval = self.lookup(packagename)
return retval
def createDummy(self, packagename, locationId): def createDummy(self, packagename, locationId):
warning("DB: Creating dummy package for: " + packagename) warning("DB: Creating dummy package for: " + packagename)
q = self.cursor() q = self.cursor()
@ -170,26 +173,32 @@ def infoFromPkgbuildFile(filename):
# open and source the file # open and source the file
pf_stdin, pf_stdout = os.popen2("/bin/bash", 't', 0) pf_stdin, pf_stdout = os.popen2("/bin/bash", 't', 0)
print >>pf_stdin, ". " + filename print >>pf_stdin, ". " + filename
#print "PKGBUILD: " + filename
# get pkgname # get pkgname
print >>pf_stdin, 'echo $pkgname' print >>pf_stdin, 'echo $pkgname'
pkgname = pf_stdout.readline().strip() pkgname = pf_stdout.readline().strip()
#print "PKGBUILD: pkgname: " + pkgname
# get pkgver # get pkgver
print >>pf_stdin, 'echo $pkgver' print >>pf_stdin, 'echo $pkgver'
pkgver = pf_stdout.readline().strip() pkgver = pf_stdout.readline().strip()
#print "PKGBUILD: pkgver: " + pkgver
# get pkgrel # get pkgrel
print >>pf_stdin, 'echo $pkgrel' print >>pf_stdin, 'echo $pkgrel'
pkgrel = pf_stdout.readline().strip() pkgrel = pf_stdout.readline().strip()
#print "PKGBUILD: pkgrel: " + pkgrel
# get url # get url
print >>pf_stdin, 'echo $url' print >>pf_stdin, 'echo $url'
url = pf_stdout.readline().strip() url = pf_stdout.readline().strip()
#print "PKGBUILD: url: " + url
# get desc # get desc
print >>pf_stdin, 'echo $pkgdesc' print >>pf_stdin, 'echo $pkgdesc'
desc = pf_stdout.readline().strip() pkgdesc = pf_stdout.readline().strip()
#print "PKGBUILD: pkgdesc: " + pkgdesc
# get source array # get source array
print >>pf_stdin, 'echo ${source[*]}' print >>pf_stdin, 'echo ${source[*]}'
@ -203,7 +212,7 @@ def infoFromPkgbuildFile(filename):
pf_stdin.close() pf_stdin.close()
pf_stdout.close() pf_stdout.close()
return pkgname, pkgver + "-" + pkgrel, desc, url, depends, source return pkgname, pkgver + "-" + pkgrel, pkgdesc, url, depends, source
def infoFromPkgbuildFileWorse(filename): def infoFromPkgbuildFileWorse(filename):
# load the file with pacman library # load the file with pacman library
@ -317,6 +326,8 @@ for a_file in a_files:
package.sources = sources package.sources = sources
package.new = version package.new = version
# print "Package: desc " + desc
packages[pkgname] = package packages[pkgname] = package
# B) Go through the old repo dir # B) Go through the old repo dir