]> err.no Git - dak/log
dak
14 years agoMerge remote branch 'drkranz/make-changelog' into merge
Joerg Jaspert [Tue, 22 Jun 2010 19:51:51 +0000 (21:51 +0200)]
Merge remote branch 'drkranz/make-changelog' into merge

* drkranz/make-changelog:
  Use sys.path.append to ensure proper environment

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoUse sys.path.append to ensure proper environment
Luca Falavigna [Tue, 22 Jun 2010 19:50:21 +0000 (19:50 +0000)]
Use sys.path.append to ensure proper environment

Signed-off-by: Luca Falavigna <dktrkranz@debian.org>
14 years agoMerge remote branch 'drkranz/make-changelog' into merge
Joerg Jaspert [Tue, 22 Jun 2010 19:38:25 +0000 (21:38 +0200)]
Merge remote branch 'drkranz/make-changelog' into merge

* drkranz/make-changelog:
  Add import_changelogs.py script

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoAdd import_changelogs.py script
Luca Falavigna [Tue, 22 Jun 2010 19:35:51 +0000 (19:35 +0000)]
Add import_changelogs.py script

Signed-off-by: Luca Falavigna <dktrkranz@debian.org>
14 years agoMerge remote branch 'drkranz/make-changelog' into merge
Joerg Jaspert [Tue, 22 Jun 2010 19:22:43 +0000 (21:22 +0200)]
Merge remote branch 'drkranz/make-changelog' into merge

* drkranz/make-changelog:
  Fix indentation
  Implement changelogs for binNMUss too
  Refactorize make-changelog handling, only for source uploads ATM
  First implementation of make-changelog command

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoMerge remote branch 'drkranz/master' into merge
Joerg Jaspert [Tue, 22 Jun 2010 19:11:03 +0000 (21:11 +0200)]
Merge remote branch 'drkranz/master' into merge

* drkranz/master:
  Fix do_newer_version package detection

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoFix do_newer_version package detection
Luca Falavigna [Tue, 22 Jun 2010 08:02:30 +0000 (08:02 +0000)]
Fix do_newer_version package detection

If projectb stores more than one version of a given source package,
cruft-report erroneously takes the lower one, and this sometimes leads
to wrong removals. Instruct cruft-report to take the highest version.

Signed-off-by: Luca Falavigna <dktrkranz@debian.org>
14 years agoFix indentation
Luca Falavigna [Tue, 22 Jun 2010 07:19:04 +0000 (07:19 +0000)]
Fix indentation

Signed-off-by: Luca Falavigna <dktrkranz@debian.org>
14 years agoImplement changelogs for binNMUss too
Luca Falavigna [Wed, 5 May 2010 06:50:46 +0000 (06:50 +0000)]
Implement changelogs for binNMUss too

Signed-off-by: Luca Falavigna <dktrkranz@debian.org>
14 years agoRefactorize make-changelog handling, only for source uploads ATM
Luca Falavigna [Wed, 21 Apr 2010 21:26:27 +0000 (21:26 +0000)]
Refactorize make-changelog handling, only for source uploads ATM

Signed-off-by: Luca Falavigna <dktrkranz@debian.org>
14 years agoFirst implementation of make-changelog command
Luca Falavigna [Tue, 16 Mar 2010 10:59:45 +0000 (10:59 +0000)]
First implementation of make-changelog command

Signed-off-by: Luca Falavigna <dktrkranz@debian.org>
14 years agoWhoops
Mark Hymers [Sun, 20 Jun 2010 20:14:33 +0000 (20:14 +0000)]
Whoops

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoKill etch
Mark Hymers [Sun, 20 Jun 2010 20:12:57 +0000 (20:12 +0000)]
Kill etch

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoWe haven't used this in ages. Please to be dying now
Mark Hymers [Sun, 20 Jun 2010 19:35:56 +0000 (19:35 +0000)]
We haven't used this in ages.  Please to be dying now

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agomoved into own git
Joerg Jaspert [Thu, 10 Jun 2010 15:51:54 +0000 (17:51 +0200)]
moved into own git

this now moved into http://ftp-master.debian.org/git/website.git/

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoindex.html addition about dinstall
Joerg Jaspert [Mon, 7 Jun 2010 20:26:45 +0000 (22:26 +0200)]
index.html addition about dinstall

added patch from Andrew Pollock <apollock@debian.org> that tells
about dinstall times and where one can look for the status.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agokill make_suite_file_list
Mark Hymers [Sat, 22 May 2010 13:16:52 +0000 (13:16 +0000)]
kill make_suite_file_list

Signed-off-by: Mark Hymers <mhy@debian.org>
14 years agoMerge remote branch 'twerner/rss' into merge
Joerg Jaspert [Tue, 16 Mar 2010 22:47:55 +0000 (23:47 +0100)]
Merge remote branch 'twerner/rss' into merge

* twerner/rss:
  don't convert changes file from utf-8 to ascii

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agodon't convert changes file from utf-8 to ascii
Torsten Werner [Tue, 16 Mar 2010 20:16:34 +0000 (20:16 +0000)]
don't convert changes file from utf-8 to ascii

Signed-off-by: Torsten Werner <twerner@debian.org>
14 years agocolor name fix
Joerg Jaspert [Sat, 27 Feb 2010 20:41:56 +0000 (21:41 +0100)]
color name fix

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoPartly revert the earlier commit and keep a recommends split
Joerg Jaspert [Sat, 27 Feb 2010 10:19:58 +0000 (11:19 +0100)]
Partly revert the earlier commit and keep a recommends split

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoadd more packages as we use them.
Joerg Jaspert [Sat, 27 Feb 2010 09:54:27 +0000 (10:54 +0100)]
add more packages as we use them.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoMove the recommends into depends, also add the -debversion package for postgres.
Joerg Jaspert [Sat, 27 Feb 2010 09:54:12 +0000 (10:54 +0100)]
Move the recommends into depends, also add the -debversion package for postgres.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoAdd start of a metapackage to just get dak running.
Allan Lyons [Fri, 8 May 2009 15:58:20 +0000 (09:58 -0600)]
Add start of a metapackage to just get dak running.

Commit 91dbbbfe193962ede641168e2c446ad807f9217a suggested that the
ftpmaster-lenny metapackage could be split in two parts and that a
ftpmaster-common metapackage could be created to document the
requirements to just get dak running. Other tools normally required
for the ftpmaster to actually do their work are in "ftpmaster-$release"

The reason for splitting out the dak requirements separately are in the
hope that someone will eventually do a complete package for dak.  This
should get them started on the requirements.

Postgresql-plperl is Recommends: rather than Depends: on the theory that
the database could be installed on a different machine.

This is not yet checked for completeness, but should give a start
to what dak actually requires to run.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
Signed-off-by: Allan Lyons <Allan_Lyons@wycliffe.ca>
14 years agoUpdate kfreebsd-* ftp stats.
Cyril Brulebois [Sat, 27 Feb 2010 09:14:05 +0000 (10:14 +0100)]
Update kfreebsd-* ftp stats.

To: debian-dak@lists.debian.org
Cc: Cyril Brulebois <kibi@debian.org>
Date: Fri, 14 Aug 2009 23:11:12 +0200
Resent-From: debian-dak@lists.debian.org

Signed-off-by: Cyril Brulebois <kibi@debian.org>
14 years agoAdd kfreebsd-{amd64,i386}.
Cyril Brulebois [Sat, 27 Feb 2010 09:14:04 +0000 (10:14 +0100)]
Add kfreebsd-{amd64,i386}.

To: debian-dak@lists.debian.org
Cc: Cyril Brulebois <kibi@debian.org>
Date: Fri, 14 Aug 2009 23:11:11 +0200
Resent-From: debian-dak@lists.debian.org

Also rewrap the colour list to make everything match as shown below:
  arch1     … archN
  archN+1   … arch2N
  colour1   … colourN
  colourN+1 … colour2N

Two colours remain on their own line.

Signed-off-by: Cyril Brulebois <kibi@debian.org>
14 years agoMerge remote branch 'mario/master' into merge
Joerg Jaspert [Sat, 27 Feb 2010 09:07:27 +0000 (10:07 +0100)]
Merge remote branch 'mario/master' into merge

* mario/master:
  init_db.py: fix for `do_priority'
  init_db.py: `Cnf.get' fix for `do_priority'
  init_db.py: fixes for `do_suite'
  init_db.py: typo fix for `do_suite' comment.
  admin.py: added command to add suites

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agodaklib/utils.py: use socket.getfqdn() to determine the hostname
Philipp Kern [Sat, 27 Feb 2010 09:02:42 +0000 (10:02 +0100)]
daklib/utils.py: use socket.getfqdn() to determine the hostname

To: debian-dak@lists.debian.org
Cc: Philipp Kern <pkern@debian.org>
Date: Tue, 23 Feb 2010 11:35:20 +0100
Resent-From: debian-dak@lists.debian.org

The current socket.gethostbyaddr(socket.gethostname()) fails horribly on
our IPv6 enabled machine.  What we really want is the FQDN of the host so
let's use socket's getfqdn().  Of course that needs proper setup of the
hostname in the system, but I think we can rely on that working.

Signed-off-by: Philipp Kern <pkern@debian.org>
14 years agoMerge remote branch 'twerner/show-new' into merge
Joerg Jaspert [Wed, 24 Feb 2010 19:41:06 +0000 (20:41 +0100)]
Merge remote branch 'twerner/show-new' into merge

* twerner/show-new:
  fix show-new

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoinit_db.py: fix for `do_priority'
Mario Domenech Goulart [Mon, 8 Feb 2010 18:56:17 +0000 (16:56 -0200)]
init_db.py: fix for `do_priority'

Look for the right priority from the config file Priority subtree..

Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
14 years agoinit_db.py: `Cnf.get' fix for `do_priority'
Mario Domenech Goulart [Mon, 8 Feb 2010 18:45:35 +0000 (16:45 -0200)]
init_db.py: `Cnf.get' fix for `do_priority'

Apparently, the `get' method expects its secong argument to be an
string, not a number.  Without this fix I get

      p.level    = self.Cnf.get("Priority::%s", 0)
  TypeError: argument 2 must be string, not int

Setting the second arg as "0" makes the error disappear.

Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
14 years agoinit_db.py: fixes for `do_suite'
Mario Domenech Goulart [Mon, 8 Feb 2010 18:37:25 +0000 (16:37 -0200)]
init_db.py: fixes for `do_suite'

* set `suite_name' mandatory field for the the Suite object

* set `suite_id' for the SuiteArchitecture object

Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
14 years agoinit_db.py: typo fix for `do_suite' comment.
Mario Domenech Goulart [Mon, 8 Feb 2010 18:17:58 +0000 (16:17 -0200)]
init_db.py: typo fix for `do_suite' comment.

s/Initalize/Initialize/

Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
14 years agoadmin.py: added command to add suites
Mario Domenech Goulart [Mon, 8 Feb 2010 18:11:56 +0000 (16:11 -0200)]
admin.py: added command to add suites

Syntax:

s add SUITE VERSION [ label=LABEL ] [ description=DESCRIPTION ]
                    [ origin=ORIGIN ] [ codename=CODENAME ]
                add suite SUITE, version VERSION. label,
                description, origin and codename are optional.

SUITE and VERSION are mandatory.  LABEL, DESCRIPTION, ORIGIN and
CODENAME can be optionally passed in a keyword-parameter-style
(var=value).

Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
14 years agofix show-new
Torsten Werner [Sat, 6 Feb 2010 21:16:45 +0000 (21:16 +0000)]
fix show-new

Signed-off-by: Torsten Werner <twerner@debian.org>
14 years agoenable "files" to run again
Joerg Jaspert [Mon, 1 Feb 2010 22:07:43 +0000 (23:07 +0100)]
enable "files" to run again

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agosome docstrings
Joerg Jaspert [Mon, 1 Feb 2010 22:07:31 +0000 (23:07 +0100)]
some docstrings

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoTell the testcases about the dsc thingie
Joerg Jaspert [Sat, 30 Jan 2010 14:09:25 +0000 (15:09 +0100)]
Tell the testcases about the dsc thingie

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoparse_changes
Joerg Jaspert [Sat, 30 Jan 2010 14:02:44 +0000 (15:02 +0100)]
parse_changes

as we also parse dsc files here, only do the rejection on missing keywords
when we parse a changes file.
adjust all calls for dsc files to tell us they are dsc, by default we do
the check, caller has to turn it off...

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agopoint release notes
Joerg Jaspert [Sat, 30 Jan 2010 13:46:28 +0000 (14:46 +0100)]
point release notes

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoutils, parse_changes
Joerg Jaspert [Sat, 30 Jan 2010 13:44:51 +0000 (14:44 +0100)]
utils, parse_changes

reject in case we are missing mandantory fields in .changes file

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agocontrol_suite sql fixup
Joerg Jaspert [Fri, 29 Jan 2010 19:29:30 +0000 (20:29 +0100)]
control_suite sql fixup

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agocreate an Uploaders index. closes: #478402
Joerg Jaspert [Sat, 23 Jan 2010 10:55:19 +0000 (11:55 +0100)]
create an Uploaders index. closes: #478402

create the uploaders index in dinstall.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agomake-maintainers
Joerg Jaspert [Sat, 23 Jan 2010 09:27:15 +0000 (10:27 +0100)]
make-maintainers

one more irritating way made a little more clear.
fixed the output so it actually works for -u

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agomake-maintainers
Joerg Jaspert [Fri, 22 Jan 2010 21:23:18 +0000 (22:23 +0100)]
make-maintainers

reverse the irritating order

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agolink to 2009, not 2008
Joerg Jaspert [Fri, 22 Jan 2010 21:03:56 +0000 (22:03 +0100)]
link to 2009, not 2008

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoadd removals-2009.txt
Joerg Jaspert [Fri, 22 Jan 2010 21:03:39 +0000 (22:03 +0100)]
add removals-2009.txt

this whole web/ should be outside dak.git, but not today

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agocrontab adjusted to reality
Joerg Jaspert [Fri, 22 Jan 2010 21:02:54 +0000 (22:02 +0100)]
crontab adjusted to reality

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoMerge remote branch 'tolimar/uploaders' into uploaders
Joerg Jaspert [Fri, 22 Jan 2010 20:36:33 +0000 (21:36 +0100)]
Merge remote branch 'tolimar/uploaders' into uploaders

* tolimar/uploaders:
  Fix my very own shiny bug
  Fix problem with uploaders containing a "," sign in their name

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoFix my very own shiny bug
Alexander Reichle-Schmehl [Fri, 22 Jan 2010 20:35:03 +0000 (21:35 +0100)]
Fix my very own shiny bug

14 years agoFix problem with uploaders containing a "," sign in their name
Alexander Reichle-Schmehl [Fri, 22 Jan 2010 20:11:13 +0000 (21:11 +0100)]
Fix problem with uploaders containing a "," sign in their name

14 years agoMerge branch 'master' into uploaders
Joerg Jaspert [Fri, 22 Jan 2010 18:46:37 +0000 (19:46 +0100)]
Merge branch 'master' into uploaders

* master:
  notautomatic
  add a "notautomatic" flag to the build queues
  removals, crontab
  Tell queue_rss where it can find out log
  tools/queue_rss.py: parse process-new reasons (Closes: #517950)
  tools/queue_rss.py: bump version and wrap to 79 columns

14 years agonotautomatic
Joerg Jaspert [Thu, 21 Jan 2010 20:49:47 +0000 (21:49 +0100)]
notautomatic

build queues can now be notautomatic.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoadd a "notautomatic" flag to the build queues
Joerg Jaspert [Thu, 21 Jan 2010 20:48:54 +0000 (21:48 +0100)]
add a "notautomatic" flag to the build queues

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoremovals, crontab
Joerg Jaspert [Wed, 20 Jan 2010 22:19:30 +0000 (23:19 +0100)]
removals, crontab

add generation of removals-full.txt, doesnt need to be in my own
crontab.
also add the crontab into VCS, even though crontab is not yet
automagically updated from VCS.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoTell queue_rss where it can find out log
Joerg Jaspert [Tue, 19 Jan 2010 20:57:59 +0000 (21:57 +0100)]
Tell queue_rss where it can find out log

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoMerge remote branch 'godog/master' into merge
Joerg Jaspert [Tue, 19 Jan 2010 20:57:28 +0000 (21:57 +0100)]
Merge remote branch 'godog/master' into merge

* godog/master:
  tools/queue_rss.py: parse process-new reasons (Closes: #517950)
  tools/queue_rss.py: bump version and wrap to 79 columns

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agotools/queue_rss.py: parse process-new reasons (Closes: #517950)
Filippo Giunchedi [Tue, 19 Jan 2010 01:37:09 +0000 (02:37 +0100)]
tools/queue_rss.py: parse process-new reasons (Closes: #517950)

This commit adds a new command line option -l to point queue_rss.py where
process-new logs are.
While processing outgoing packages parse also logdir/%Y-%m to search for a
reason (ACCEPT/REJECT) and include it in the RSS entry, if any.

Signed-off-by: Filippo Giunchedi <filippo@debian.org>
14 years agotools/queue_rss.py: bump version and wrap to 79 columns
Filippo Giunchedi [Tue, 19 Jan 2010 01:36:05 +0000 (02:36 +0100)]
tools/queue_rss.py: bump version and wrap to 79 columns

Signed-off-by: Filippo Giunchedi <filippo@debian.org>
14 years agomake_maintainers.py: Support creating an uploaders index, closes: #120262
Emilio Pozuelo Monfort [Sun, 15 Nov 2009 16:13:13 +0000 (17:13 +0100)]
make_maintainers.py: Support creating an uploaders index, closes: #120262

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agounify buildd queues, no matter which suite
Joerg Jaspert [Mon, 11 Jan 2010 23:11:29 +0000 (00:11 +0100)]
unify buildd queues, no matter which suite

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agosome docstrings
Joerg Jaspert [Mon, 11 Jan 2010 23:11:00 +0000 (00:11 +0100)]
some docstrings

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoAnd its now 31
Joerg Jaspert [Sun, 10 Jan 2010 18:17:05 +0000 (19:17 +0100)]
And its now 31

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoMerge remote branch 'stew/contents' into merge
Joerg Jaspert [Sun, 10 Jan 2010 18:15:30 +0000 (19:15 +0100)]
Merge remote branch 'stew/contents' into merge

* stew/contents:
  fixing triggers
  call generate instead of deb_generate so that udeb contents are generated

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agofixing triggers
Mike O'Connor [Sun, 10 Jan 2010 17:10:06 +0000 (12:10 -0500)]
fixing triggers

Signed-off-by: Mike O'Connor <stew@vireo.org>
14 years agocall generate instead of deb_generate so that udeb contents are generated
Mike O'Connor [Sun, 10 Jan 2010 00:07:46 +0000 (19:07 -0500)]
call generate instead of deb_generate so that udeb contents are generated

Signed-off-by: Mike O'Connor <stew@vireo.org>
14 years agoMerge remote branch 'stew/contents' into merge
Joerg Jaspert [Sun, 10 Jan 2010 00:01:27 +0000 (01:01 +0100)]
Merge remote branch 'stew/contents' into merge

* stew/contents:
  o.type -> ot.type

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoo.type -> ot.type
Mike O'Connor [Sun, 10 Jan 2010 00:00:57 +0000 (19:00 -0500)]
o.type -> ot.type

Signed-off-by: Mike O'Connor <stew@vireo.org>
14 years agoMerge remote branch 'stew/contents' into merge
Joerg Jaspert [Sat, 9 Jan 2010 23:57:05 +0000 (00:57 +0100)]
Merge remote branch 'stew/contents' into merge

* stew/contents:
  limit the query in 'update-content-for-bin_a' to only look for deb,udeb

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agolimit the query in 'update-content-for-bin_a' to only look for deb,udeb
Mike O'Connor [Sat, 9 Jan 2010 23:55:03 +0000 (18:55 -0500)]
limit the query in 'update-content-for-bin_a' to only look for deb,udeb

Signed-off-by: Mike O'Connor <stew@vireo.org>
14 years agoMerge remote branch 'stew/contents' into merge
Joerg Jaspert [Sat, 9 Jan 2010 23:48:16 +0000 (00:48 +0100)]
Merge remote branch 'stew/contents' into merge

* stew/contents:
  add update30 to fix 'bin_contents' trigger
  dak.py
  dbconn
  Missing ,
  Is schema 30 now

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoadd update30 to fix 'bin_contents' trigger
Mike O'Connor [Sat, 9 Jan 2010 23:46:04 +0000 (18:46 -0500)]
add update30 to fix 'bin_contents' trigger

Signed-off-by: Mike O'Connor <stew@vireo.org>
14 years agodak.py
Joerg Jaspert [Sat, 9 Jan 2010 23:16:44 +0000 (00:16 +0100)]
dak.py

ignore the crap sqlalchemy warnings

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoMerge branch 'merge'
Joerg Jaspert [Sat, 9 Jan 2010 22:43:38 +0000 (23:43 +0100)]
Merge branch 'merge'

* merge:
  fixes from some previous bad merge

14 years agoMerge remote branch 'stew/contents' into merge
Joerg Jaspert [Sat, 9 Jan 2010 22:43:35 +0000 (23:43 +0100)]
Merge remote branch 'stew/contents' into merge

* stew/contents:
  fixes from some previous bad merge

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agofixes from some previous bad merge
Mike O'Connor [Sat, 9 Jan 2010 22:42:42 +0000 (17:42 -0500)]
fixes from some previous bad merge

Signed-off-by: Mike O'Connor <stew@vireo.org>
14 years agodbconn
Joerg Jaspert [Sat, 9 Jan 2010 21:03:44 +0000 (22:03 +0100)]
dbconn

i think he meant suite, not component, looking at the table

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoMissing ,
Joerg Jaspert [Sat, 9 Jan 2010 20:51:39 +0000 (21:51 +0100)]
Missing ,

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoIs schema 29 now
Joerg Jaspert [Sat, 9 Jan 2010 20:41:57 +0000 (21:41 +0100)]
Is schema 29 now

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoMerge remote branch 'stew/contents' into merge
Joerg Jaspert [Sat, 9 Jan 2010 20:33:20 +0000 (21:33 +0100)]
Merge remote branch 'stew/contents' into merge

* stew/contents:
  bride of bad index name
  return of bad index name
  bad index name
  you can quote me on that
  lalalal
  those are strings not ints
  another wrong way to paramaterize
  wrong way to paramaterize
  really don't use DBConn() in an update
  don't use DBConn() in an update

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agobride of bad index name
Mike O'Connor [Sat, 9 Jan 2010 20:29:55 +0000 (15:29 -0500)]
bride of bad index name

Signed-off-by: Mike O'Connor <stew@vireo.org>
14 years agoreturn of bad index name
Mike O'Connor [Sat, 9 Jan 2010 20:23:16 +0000 (15:23 -0500)]
return of bad index name

Signed-off-by: Mike O'Connor <stew@vireo.org>
14 years agobad index name
Mike O'Connor [Sat, 9 Jan 2010 20:20:24 +0000 (15:20 -0500)]
bad index name

Signed-off-by: Mike O'Connor <stew@vireo.org>
14 years agoyou can quote me on that
Mike O'Connor [Sat, 9 Jan 2010 20:17:56 +0000 (15:17 -0500)]
you can quote me on that

Signed-off-by: Mike O'Connor <stew@vireo.org>
14 years agolalalal
Mike O'Connor [Sat, 9 Jan 2010 20:17:15 +0000 (15:17 -0500)]
lalalal

Signed-off-by: Mike O'Connor <stew@vireo.org>
14 years agothose are strings not ints
Mike O'Connor [Sat, 9 Jan 2010 20:14:52 +0000 (15:14 -0500)]
those are strings not ints

Signed-off-by: Mike O'Connor <stew@vireo.org>
14 years agoanother wrong way to paramaterize
Mike O'Connor [Sat, 9 Jan 2010 20:14:15 +0000 (15:14 -0500)]
another wrong way to paramaterize

Signed-off-by: Mike O'Connor <stew@vireo.org>
14 years agowrong way to paramaterize
Mike O'Connor [Sat, 9 Jan 2010 20:13:15 +0000 (15:13 -0500)]
wrong way to paramaterize

Signed-off-by: Mike O'Connor <stew@vireo.org>
14 years agoreally don't use DBConn() in an update
Mike O'Connor [Sat, 9 Jan 2010 20:12:16 +0000 (15:12 -0500)]
really don't use DBConn() in an update

Signed-off-by: Mike O'Connor <stew@vireo.org>
14 years agodon't use DBConn() in an update
Mike O'Connor [Sat, 9 Jan 2010 20:11:31 +0000 (15:11 -0500)]
don't use DBConn() in an update

Signed-off-by: Mike O'Connor <stew@vireo.org>
14 years agoMerge remote branch 'stew/contents' into merge
Joerg Jaspert [Sat, 9 Jan 2010 20:07:25 +0000 (21:07 +0100)]
Merge remote branch 'stew/contents' into merge

* stew/contents:
  index all suites

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoindex all suites
Mike O'Connor [Sat, 9 Jan 2010 20:06:06 +0000 (15:06 -0500)]
index all suites

Signed-off-by: Mike O'Connor <stew@vireo.org>
14 years agoMerge remote branch 'stew/contents' into merge
Joerg Jaspert [Sat, 9 Jan 2010 20:03:24 +0000 (21:03 +0100)]
Merge remote branch 'stew/contents' into merge

* stew/contents:
  add Config() import

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoadd Config() import
Mike O'Connor [Sat, 9 Jan 2010 19:55:08 +0000 (14:55 -0500)]
add Config() import

Signed-off-by: Mike O'Connor <stew@vireo.org>
14 years agoMerge remote branch 'stew/contents' into merge
Joerg Jaspert [Sat, 9 Jan 2010 19:51:23 +0000 (20:51 +0100)]
Merge remote branch 'stew/contents' into merge

* stew/contents:
  suites -> _suites

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agosuites -> _suites
Mike O'Connor [Sat, 9 Jan 2010 19:50:47 +0000 (14:50 -0500)]
suites -> _suites

Signed-off-by: Mike O'Connor <stew@vireo.org>
14 years agoMerge remote branch 'stew/contents' into merge
Joerg Jaspert [Sat, 9 Jan 2010 19:48:36 +0000 (20:48 +0100)]
Merge remote branch 'stew/contents' into merge

* stew/contents:
  self.suites->suites

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agoself.suites->suites
Mike O'Connor [Sat, 9 Jan 2010 19:46:31 +0000 (14:46 -0500)]
self.suites->suites

Signed-off-by: Mike O'Connor <stew@vireo.org>
14 years agoMerge remote branch 'stew/contents' into merge
Joerg Jaspert [Sat, 9 Jan 2010 19:41:12 +0000 (20:41 +0100)]
Merge remote branch 'stew/contents' into merge

* stew/contents:
  fix errant middle click
  forgot to save update29
  fix errors found by epydoc
  update29 to get rid of old contents tables

Signed-off-by: Joerg Jaspert <joerg@debian.org>
14 years agofix errant middle click
Mike O'Connor [Sat, 9 Jan 2010 19:37:39 +0000 (14:37 -0500)]
fix errant middle click

Signed-off-by: Mike O'Connor <stew@vireo.org>