- Aur-dev - lists.archlinux.org

[aur-dev] Git patch for AUR navigation links
by Thayer Williams 25 Nov '08

25 Nov '08

I'm not sure who the rightful recipient for this patch is, but could someone with commit priveledges apply this patch to the AUR git project? It replaces the top navigation "Get Arch" link with "Download". Thanks! Thayer

2 2

[aur-dev] [patch] ru translation mistypes
by Sergej Pupykin 24 Nov '08

24 Nov '08

Hi, 3 mistypes fixed by this patch.

1 0

[aur-dev] [PATCH] Remove redundant tupkgs.conf.
by Loui Chang 24 Nov '08

24 Nov '08

I've pushed this. Signed-off-by: Loui Chang <louipc.ist(a)gmail.com> --- support/scripts/tupkgs.conf | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) delete mode 100644 support/scripts/tupkgs.conf diff --git a/support/scripts/tupkgs.conf b/support/scripts/tupkgs.conf deleted file mode 100644 index ab10866..0000000 --- a/support/scripts/tupkgs.conf +++ /dev/null @@ -1,10 +0,0 @@ -[tupkgs] -port = 1034 -cachedir = /home/aur/packages/full -incomingdir = /home/aur/packages/partial - -[mysql] -username = aur -password = PbLus6wH -host = localhost -db = aur -- 1.6.0.4

1 0

[aur-dev] [PATCH] Clean up packages.php and document new package functions
by Callan Barrett 23 Nov '08

23 Nov '08

Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/packages.php | 65 +++++++++++++++++++------------------------------ web/lib/pkgfuncs.inc | 48 ++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 40 deletions(-) diff --git a/web/html/packages.php b/web/html/packages.php index f06aaa1..9c611d8 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -8,38 +8,31 @@ include("search_po.inc"); # use some form of this for i18n support set_lang(); # this sets up the visitor's language check_sid(); # see if they're still logged in -# set the title to something useful depending on -# what "page" we're on -# +# Set the title to the current query if required if (isset($_GET['ID'])) { - $id = pkgname_from_id($_GET['ID']); - if (!empty($id)) { - $title = $id; - } -} else if (!empty($_GET['K'])) { - $title = "Search: " . $_GET['K']; + if (pkgname_from_id($_GET['ID'])) { $title = $id; } +} else if (!empty($_GET['K'])) { + $title = __("Search Criteria") . ": " . $_GET['K']; } else { $title = __("Packages"); } -html_header($title); - -# get login privileges -# +# Retrieve account type if (isset($_COOKIE["AURSID"])) { - # Only logged in users can do stuff - # $atype = account_from_sid($_COOKIE["AURSID"]); } else { $atype = ""; } -# grab the list of Package IDs to be operated on +# Grab the list of Package IDs to be operated on # +# TODO: Convert this to a normal array of IDs to operate on and convert the +# functions to use this format isset($_POST["IDs"]) ? $ids = $_POST["IDs"] : $ids = array(); -# determine what button the visitor clicked -# +html_header($title); + +# Determine what action to do if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { print ""; print pkg_flag($atype, $ids, True); @@ -48,18 +41,14 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { print ""; print pkg_flag($atype, $ids, False); print ""; -} elseif ($_POST['action'] == "do_Disown" || isset($_POST['do_Disown'])) { - print ""; - print pkg_adopt($atype, $ids, False); - print ""; -} elseif ($_POST['action'] == "do_Delete" || isset($_POST['do_Delete'])) { - print ""; - print pkg_delete($atype, $ids, False); - print ""; } elseif ($_POST['action'] == "do_Adopt" || isset($_POST['do_Adopt'])) { print ""; print pkg_adopt($atype, $ids, True); print ""; +} elseif ($_POST['action'] == "do_Disown" || isset($_POST['do_Disown'])) { + print ""; + print pkg_adopt($atype, $ids, False); + print ""; } elseif ($_POST['action'] == "do_Vote" || isset($_POST['do_Vote'])) { print ""; print pkg_vote($atype, $ids, True); @@ -68,26 +57,22 @@ if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { print ""; print pkg_vote($atype, $ids, False); print ""; -} elseif (isset($_GET["ID"])) { - - if (!intval($_GET["ID"])) { - print __("Error trying to retrieve package details.")." \n"; - - } else { - package_details($_GET["ID"], $_COOKIE["AURSID"]); - } - +} elseif ($_POST['action'] == "do_Delete" || isset($_POST['do_Delete'])) { + print ""; + print pkg_delete($atype, $ids); + print ""; } elseif ($_POST['action'] == "do_Notify" || isset($_POST['do_Notify'])) { print ""; print pkg_notify($atype, $ids); print ""; +} elseif (isset($_GET["ID"])) { + if (!is_numeric($_GET["ID"])) { + print __("Error trying to retrieve package details.") . " "; + } else { + package_details($_GET["ID"], $_COOKIE["AURSID"]); + } } else { - # just do a search - # pkg_search_page($_COOKIE["AURSID"]); - } html_footer(AUR_VERSION); - -?> diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 5c179fa..9941103 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -985,6 +985,17 @@ function pkg_search_page($SID="") { return; } +/** + * Flag and un-flag packages out-of-date + * + * @param string $atype Account type, output of account_from_sid + * @param array $ids Array of package IDs to flag/unflag, formatted as + * $package_id => $useless_crap + * @param boolean $action True flags out-of-date, false un-flags. Flags by + * default + * + * @return string Translated success or error messages + */ function pkg_flag ($atype, $ids, $action = True) { if (!$atype) { if ($action) { @@ -1059,6 +1070,15 @@ function pkg_flag ($atype, $ids, $action = True) { } } +/** + * Delete packages + * + * @param string $atype Account type, output of account_from_sid + * @param array $ids Array of package IDs to delete, formatted as + * $package_id => $useless_crap + * + * @return string Translated error or success message + */ function pkg_delete ($atype, $ids) { if (!$atype) { return __("You must be logged in before you can disown packages."); @@ -1132,6 +1152,16 @@ function pkg_delete ($atype, $ids) { return __("The selected packages have been deleted."); } +/** + * Adopt or disown packages + * + * @param string $atype Account type, output of account_from_sid + * @param array $ids Array of package IDs to adopt/disown, formatted as + * $package_id => $whatever + * @param boolean $action Adopts if true, disowns if false. Adopts by default + * + * @return string Translated error or success message + */ function pkg_adopt ($atype, $ids, $action = True) { if (!$atype) { if ($action) { @@ -1190,6 +1220,16 @@ function pkg_adopt ($atype, $ids, $action = True) { } } +/** + * Vote and un-vote for packages + * + * @param string $atype Account type, output of account_from_sid + * @param array $ids Array of package IDs to vote/un-vote, formatted as + * $package_id => $useless + * @param boolean $action Votes if true, un-votes if false. Votes by default + * + * @return string Translated error or success message + */ function pkg_vote ($atype, $ids, $action = True) { if (!$atype) { if ($action) { @@ -1267,6 +1307,14 @@ function pkg_vote ($atype, $ids, $action = True) { } } +/** + * Toggle notification of packages + * + * @param string $atype Account type, output of account_from_sid + * @param array $ids Array of package IDs to toggle, formatted as $package_id => $crap + * + * @return string Translated error or success message + */ function pkg_notify ($atype, $ids) { if (!$atype) { return __("You must be logged in before you can get notifications on comments."); -- 1.6.0.2

2 1

[aur-dev] [patch] russian translation update
by Sergej Pupykin 19 Nov '08

19 Nov '08

Hi, this is russian translation update.

2 1

[aur-dev] [PATCH] Make remembered sessions actually save themselves.
by Loui Chang 14 Nov '08

14 Nov '08

1 0

[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