- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Move package notification into a function.
by Loui Chang 13 Nov '08

13 Nov '08

Here's a new patch for new notification behaviour. Giv'er a spin!

1 1

[aur-dev] [PATCH] Give group writable permissions to uploaded files.
by Loui Chang 13 Nov '08

13 Nov '08

1 1

[aur-dev] [PATCH] tupkgupdate: expand all tabs
by Dan McGee 12 Nov '08

12 Nov '08

90% of them were already expanded. Adjust the mode line accordingly. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- tupkg/update/tupkgupdate | 84 +++++++++++++++++++++++----------------------- 1 files changed, 42 insertions(+), 42 deletions(-) diff --git a/tupkg/update/tupkgupdate b/tupkg/update/tupkgupdate index a047d68..f20ef9a 100755 --- a/tupkg/update/tupkgupdate +++ b/tupkg/update/tupkgupdate @@ -45,11 +45,11 @@ class PackageDatabase: self.dbname = dbname self.connection = MySQLdb.connect(host=host, user=user, passwd=password, db=dbname) def cursor(self): - try: - self.connection.ping() - except MySQLdb.OperationalError: - self.connection = MySQLdb.connect(host=self.host, user=self.user, passwd=self.password, db=self.dbname) - return self.connection.cursor() + try: + self.connection.ping() + except MySQLdb.OperationalError: + self.connection = MySQLdb.connect(host=self.host, user=self.user, passwd=self.password, db=self.dbname) + return self.connection.cursor() def lookup(self, packagename): warning("DB: Looking up package: " + packagename) q = self.cursor() @@ -94,7 +94,7 @@ class PackageDatabase: os.path.join(repo_dir, os.path.basename(package.new.file))) + "', " + "Description = '" + MySQLdb.escape_string(str(package.desc)) + "', " + "DummyPkg = 0, " + - "SubmittedTS = UNIX_TIMESTAMP(), " + + "SubmittedTS = UNIX_TIMESTAMP(), " + "URL = '" + MySQLdb.escape_string(str(package.url)) + "' " + "WHERE ID = " + str(id)) else: @@ -116,7 +116,7 @@ class PackageDatabase: row = q.fetchone() if (row[0] != 3): q = self.cursor() - q.execute("UPDATE Packages SET LocationID = 3, MaintainerUID = null WHERE ID = " + str(id)) + q.execute("UPDATE Packages SET LocationID = 3, MaintainerUID = null WHERE ID = " + str(id)) def remove(self, id, locationId): warning("DB: Removing package with id: " + str(id)) q = self.cursor() @@ -212,12 +212,12 @@ def areFilesIdentical(file_a, file_b): ############################################################ def infoFromPackageFile(filename): - pkg = os.path.basename(filename) - m = re.compile("(?P<pkgname>.*)-(?P<pkgver>.*)-(?P<pkgrel>.*).pkg.tar.gz").search(pkg) - if not m: - raise Exception("Non-standard filename") - else: - return m.group('pkgname'), m.group('pkgver') + "-" + m.group('pkgrel') + pkg = os.path.basename(filename) + m = re.compile("(?P<pkgname>.*)-(?P<pkgver>.*)-(?P<pkgrel>.*).pkg.tar.gz").search(pkg) + if not m: + raise Exception("Non-standard filename") + else: + return m.group('pkgname'), m.group('pkgver') + "-" + m.group('pkgrel') def infoFromPkgbuildFile(filename): # first grab the category based on the file path @@ -306,23 +306,23 @@ def runGensync(repo, pkgbuild): return execute(command) def runRepoAdd(repo, package): - global havefakeroot - targetDB = os.path.join(repo, "community.db.tar.gz") - destfile = os.path.join(repo, os.path.basename(package.new.file)) - if havefakeroot: - command = "fakeroot repo-add '" + targetDB + "' '" + destfile + "'" - else: - command = "repo-add '" + targetDB + "' '" + destfile + "'" - return execute(command) + global havefakeroot + targetDB = os.path.join(repo, "community.db.tar.gz") + destfile = os.path.join(repo, os.path.basename(package.new.file)) + if havefakeroot: + command = "fakeroot repo-add '" + targetDB + "' '" + destfile + "'" + else: + command = "repo-add '" + targetDB + "' '" + destfile + "'" + return execute(command) def runRepoRemove(repo, pkgname): - global havefakeroot - targetDB = os.path.join(repo, "community.db.tar.gz") - if havefakeroot: - command = "fakeroot repo-remove '" + targetDB + "' '"+ pkgname + "'" - else: - command = "repo-remove '" + targetDB + "' '" + pkgname +"'" - return execute(command) + global havefakeroot + targetDB = os.path.join(repo, "community.db.tar.gz") + if havefakeroot: + command = "fakeroot repo-remove '" + targetDB + "' '"+ pkgname + "'" + else: + command = "repo-remove '" + targetDB + "' '" + pkgname +"'" + return execute(command) ############################################################ # Functions for error handling @@ -360,9 +360,9 @@ if (len(args_proper) < 3): # Make sure we can use fakeroot, warn if not havefakeroot = False if os.access('/usr/bin/fakeroot', os.X_OK): - havefakeroot = True + havefakeroot = True else: - warning("Not using fakeroot for repo db generation") + warning("Not using fakeroot for repo db generation") repo_dir, pkgbuild_dir, build_dir = args_proper @@ -509,11 +509,11 @@ for package in packages.values(): if (switches.get("--paranoid") == True and package.new.file != None): if not (areFilesIdentical(package.old.file, package.new.file)): warning("New package file with identical version '" + - package.new.file + "' is different than the old one:") - if (switches.get("--delete") == True): + package.new.file + "' is different than the old one:") + if (switches.get("--delete") == True): warning(" Deleting the new file.") delete.append(package.new.file) - else: + else: warning(" Ignoring the new file.") continue @@ -570,14 +570,14 @@ if (switches.get("--delete") == True): # Run updatesync where it is needed for package in dbremove: - retval = runRepoRemove(repo_dir, package.name) - if (retval != 0): - error("repo-remove returned an error!") - sys.exit(-1) + retval = runRepoRemove(repo_dir, package.name) + if (retval != 0): + error("repo-remove returned an error!") + sys.exit(-1) for package in dbmodify: - retval = runRepoAdd(repo_dir, package) - if (retval != 0): - error("repo-add returned an error!") - sys.exit(-1) + retval = runRepoAdd(repo_dir, package) + if (retval != 0): + error("repo-add returned an error!") + sys.exit(-1) -# vim: ft=python ts=2 sw=2 noet +# vim: ft=python ts=2 sw=2 et -- 1.6.0.4

2 3

[aur-dev] tupkgupdate
by Chris Brannon 12 Nov '08

12 Nov '08

"Aaron Griffin" <aaronmgriffin(a)gmail.com> writes: > is related to the AUR backend daemon (tupkgupdate ?), which is in the > AUR repository. A rewrite would be HUGELY appreciated.... the steps > are simple: find new packages in upload dir, add to pacman DB, add to > mysql DB. It's not all that hard, yet the current daemon runs through > ALL packages when it does this, IIRC I had a look at the tupkgupdate code. The main source of I/O seems to be the following loop: a_files = pkgbuildsInTree(pkgbuild_dir) for a_file in a_files: pkgname, ver, desc, url, depends, sources, category = \ infoFromPkgbuildFile(a_file) infoFromPkgbuildFile forks and execs bash to process a PKGBUILD. All of the code that deals with binary packages only extracts information from filenames, as far as I can tell. Would it be reasonable to use timestamps to determine which packages have been updated? -- Chris

2 1

[aur-dev] [PATCH] Tweak TU interface for appearance.
by Loui Chang 10 Nov '08

10 Nov '08

1 0

[aur-dev] [ANNOUNCE] Testing branch deleted.
by Loui Chang 06 Nov '08

06 Nov '08

I've now deleted the testing branch. To delete the remote tracking branch yourself just run: # git branch -r -d origin/testing

1 0

[aur-dev] [ANNOUNCEMENT] Current development will now be done on the master branch.
by Loui 04 Nov '08

04 Nov '08

As Dan suggested (and really makes the most sense) all new development will be done on the master branch of the git repository. Additionally there's a stable branch for what master used to be. Cheers!

1 0

[aur-dev] [PATCH] Revert "Use system rm in rm_rf function."
by Dan McGee 04 Nov '08

04 Nov '08

This reverts commit 5c3f01909301f641f57b2ffe8b59609de6be2256. Falling back to a system function is really dumb when all we need to do is fix the ordering of things in this function. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Guys, I sent the last patches based off of the master branch- looks like I have no idea how your development works, sorry about that. Anyway here is the series based off of the testing branch. It still will need some testing. -Dan web/lib/aur.inc | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/web/lib/aur.inc b/web/lib/aur.inc index a126bb9..ade5b82 100644 --- a/web/lib/aur.inc +++ b/web/lib/aur.inc @@ -374,10 +374,19 @@ function can_submit_pkg($name="", $sid="") { # recursive delete directory # function rm_rf($dirname="") { - if ($dirname != "") { - exec('rm -rf ' . escapeshellcmd($dirname)); + $d = dir($dirname); + while ($f = $d->read()) { + if ($f != "." && $f != "..") { + if (is_dir($dirname."/".$f)) { + rm_rf($dirname."/".$f); + } + if (is_file($dirname."/".$f) || is_link($dirname."/".$f)) { + unlink($dirname."/".$f); + } + } } - + $d->close(); + rmdir($dirname); return; } -- 1.6.0.3

3 6

[aur-dev] [PATCH] Commit version of communitypkg in current use.
by Loui 04 Nov '08

04 Nov '08

I'm going ahead and pushing this.

1 0

[aur-dev] [PATCH] Convert package notification to a function
by Callan Barrett 31 Oct '08

31 Oct '08

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/packages.php | 46 ++--------------------------------------- web/lib/pkgfuncs.inc | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 43 deletions(-) diff --git a/web/html/packages.php b/web/html/packages.php index 91b0e6e..f06aaa1 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -78,49 +78,9 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { } } elseif ($_POST['action'] == "do_Notify" || isset($_POST['do_Notify'])) { - # I realize that the implementation here seems a bit convoluted, but we want to - # ensure that everything happens as it should, even if someone called this page - # without having clicked a button somewhere (naughty naughty). This also leaves - # room to someday expand and allow to add oneself to multiple lists at once. -SL - if (!$atype) { - print __("You must be logged in before you can get notifications on comments."); - print " \n"; - } else { - if (!empty($ids)) { - $dbh = db_connect(); - $uid = uid_from_sid($_COOKIE["AURSID"]); - # There currently shouldn't be multiple requests here, but the format in which - # it's sent requires this - while (list($pid, $v) = each($ids)) { - $q = "SELECT Name FROM Packages WHERE ID = " . $pid; - $pkgname = mysql_result(db_query($q, $dbh), 0); - - $q = "SELECT * FROM CommentNotify WHERE UserID = ".$uid; - $q.= " AND PkgID = ".$pid; - - if (!mysql_num_rows(db_query($q, $dbh))) { - $q = "INSERT INTO CommentNotify (PkgID, UserID) VALUES (".$pid.', '.$uid.')'; - db_query($q, $dbh); - print ''; - print __("You have been added to the comment notification list for %s.", - array("" . $pkgname . "")); - print ' '; - } else { - $q = "DELETE FROM CommentNotify WHERE PkgID = ".$pid; - $q.= " AND UserID = ".$uid; - db_query($q, $dbh); - print ''; - print __("You have been removed from the comment notification list for %s.", - array("" . $pkgname . "")); - print ' '; - } - } - } else { - print ''; - print __("Couldn't add to notification list."); - print ' '; - } - } + print ""; + print pkg_notify($atype, $ids); + print ""; } else { # just do a search # diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 6d8b1a7..5c179fa 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -1266,3 +1266,56 @@ function pkg_vote ($atype, $ids, $action = True) { return __("Your votes have been removed from the selected packages."); } } + +function pkg_notify ($atype, $ids) { + if (!$atype) { + return __("You must be logged in before you can get notifications on comments."); + } + + if (empty($ids)) { + return __("Couldn't add to notification list."); + } + + $dbh = db_connect(); + $uid = uid_from_sid($_COOKIE["AURSID"]); + + # There currently shouldn't be multiple requests here, but the format in which + # it's sent requires this + $list = array(); + + foreach ($ids as $pid => $v) { + $q = "SELECT Name FROM Packages WHERE ID = " . $pid; + $pkgname = mysql_result(db_query($q, $dbh), 0); + + $q = "SELECT * FROM CommentNotify WHERE UserID = ".$uid; + $q.= " AND PkgID = ".$pid; + + if (!mysql_num_rows(db_query($q, $dbh))) { + $action = True; + + $q = "INSERT INTO CommentNotify (PkgID, UserID) VALUES (".$pid.', '.$uid.')'; + db_query($q, $dbh); + + $list[] = $pkgname; + } else { + $action = False; + + $q = "DELETE FROM CommentNotify WHERE PkgID = ".$pid; + $q.= " AND UserID = ".$uid; + db_query($q, $dbh); + + $list[] = $pkgname; + } + } + + $msg = "" . array_shift($list) . ""; + foreach ($list as $i) { + $msg .= ", " . $i . ""; + } + + if ($action) { + print __("You have been added to the comment notification list for %s.", $msg); + } else { + print __("You have been removed from the comment notification list for %s.", $msg); + } +} -- 1.6.0.2

2 2