Merge branch 'master' into gps

* master:
  examine-package: lock access to printed_copyrights
  show-new: multithreading support
  show-new: no longer fiddle with sys.stdout
  examine_package: make most functions functional
  examine-package: really support option -H
  examine-package: add missing newlines to output
  examine-package: make foldable_output functional()
  examine-package: make headline() functional
  call check_deb() with correct arguments
  Add config for volatile

Merge remote branch 'twerner/show-new' into merge

* twerner/show-new:
  examine-package: lock access to printed_copyrights
  show-new: multithreading support
  show-new: no longer fiddle with sys.stdout
  examine_package: make most functions functional
  examine-package: really support option -H
  examine-package: add missing newlines to output
  examine-package: make foldable_output functional()
  examine-package: make headline() functional
  call check_deb() with correct arguments
  Add config for volatile

Signed-off-by: Joerg Jaspert <joerg@debian.org>

dont replace the path in DAILY_APT_CONF right now, make it nicer later in an AptCOnf class. also dont call with the suite name, it knows it anyways

Signed-off-by: Joerg Jaspert <joerg@debian.org>

examine-package: lock access to printed_copyrights

FIXME: the global variable printed_copyrights is still broken...

Signed-off-by: Torsten Werner <twerner@debian.org>

show-new: multithreading support

Signed-off-by: Torsten Werner <twerner@debian.org>

generate-packages-sources

generate packages sources files, threaded, one thread per suite/arch

Signed-off-by: Joerg Jaspert <joerg@debian.org>

show-new: no longer fiddle with sys.stdout

Signed-off-by: Torsten Werner <twerner@debian.org>

examine_package: make most functions functional

Signed-off-by: Torsten Werner <twerner@debian.org>

examine-package: really support option -H

Signed-off-by: Torsten Werner <twerner@debian.org>

examine-package: add missing newlines to output

Signed-off-by: Torsten Werner <twerner@debian.org>

examine-package: make foldable_output functional()

Signed-off-by: Torsten Werner <twerner@debian.org>

examine-package: make headline() functional

Signed-off-by: Torsten Werner <twerner@debian.org>

Merge branch 'master' into show-new

call check_deb() with correct arguments

Signed-off-by: Torsten Werner <twerner@debian.org>

Add start of a generate_packages_sources command

Signed-off-by: Joerg Jaspert <joerg@debian.org>

Add config for volatile

Signed-off-by: Mark Hymers <mhy@debian.org>

Merge commit 'ftpmaster/master'

Add volatile testing dists files

Signed-off-by: Mark Hymers <mhy@debian.org>

Less backgrounding before a-f

Signed-off-by: Joerg Jaspert <joerg@debian.org>

Merge remote branch 'twerner/show-new' into merge

* twerner/show-new:
  show-new: open a new session for every source package

Signed-off-by: Joerg Jaspert <joerg@debian.org>

show-new: open a new session for every source package

Signed-off-by: Torsten Werner <twerner@debian.org>

Sigh

Signed-off-by: Joerg Jaspert <joerg@debian.org>

Merge remote branch 'twerner/msfl' into merge

* twerner/msfl:
  introduce defaultThreadCount
  add key Common::ThreadCount to dak.conf

Signed-off-by: Joerg Jaspert <joerg@debian.org>

Use the real path, not my local one - whoops

Signed-off-by: Mark Hymers <mhy@debian.org>

introduce defaultThreadCount

... make it an int and let it default to 1 (single threading)

Signed-off-by: Torsten Werner <twerner@debian.org>

Move franck's dak to 5433

Signed-off-by: Mark Hymers <mhy@debian.org>

What, are we still using postgres 7.4 or something?

Signed-off-by: Mark Hymers <mhy@debian.org>

Remove hardcoding of database name, port etc

Signed-off-by: Mark Hymers <mhy@debian.org>

We really don't want environment variables to cause us to drop the wrong damn database

Signed-off-by: Mark Hymers <mhy@debian.org>

Don't need a database connection for this

Signed-off-by: Mark Hymers <mhy@debian.org>

Merge branch 'master' into msfl

add key Common::ThreadCount to dak.conf

That is the default number of threads created for the ThreadPool() but
the value can be overwritten when calling the constructor.

Signed-off-by: Torsten Werner <twerner@debian.org>

Allow getting db config out easily

Signed-off-by: Mark Hymers <mhy@debian.org>

Merge remote branch 'twerner/msfl' into merge

* twerner/msfl:
  make generate-filelist multithreaded

Signed-off-by: Joerg Jaspert <joerg@debian.org>

make generate-filelist multithreaded

Signed-off-by: Torsten Werner <twerner@debian.org>

Merge remote branch 'twerner/msfl' into merge

* twerner/msfl:
  add threadpool implementation
  improve multithread robustness

Signed-off-by: Joerg Jaspert <joerg@debian.org>

And more public

Signed-off-by: Joerg Jaspert <joerg@debian.org>

add threadpool implementation

... and its license information

Signed-off-by: Torsten Werner <twerner@debian.org>

improve multithread robustness

- create a separate db session per suite and component in writeSourceList()

Signed-off-by: Torsten Werner <twerner@debian.org>

And this also public. ohmy

Signed-off-by: Joerg Jaspert <joerg@debian.org>

use template1

Signed-off-by: Joerg Jaspert <joerg@debian.org>

debianqueued

rename does not work across devices. Use move from File::Copy instead.

Signed-off-by: Joerg Jaspert <joerg@debian.org>

And one more in public

Signed-off-by: Joerg Jaspert <joerg@debian.org>

And thats in public view

Signed-off-by: Joerg Jaspert <joerg@debian.org>

Unfortunately DSA doesnt give us all rights anymore for no good reason to do a sane backup, including our roles, so deactivate that part. :(

Signed-off-by: Joerg Jaspert <joerg@debian.org>

One would think at some point one got all

Signed-off-by: Joerg Jaspert <joerg@debian.org>

One would think at some point one got all

Signed-off-by: Joerg Jaspert <joerg@debian.org>

One would think at some point one got all

Signed-off-by: Joerg Jaspert <joerg@debian.org>

No, webdir is public, damnit

Signed-off-by: Joerg Jaspert <joerg@debian.org>

No, webdir is public

Signed-off-by: Joerg Jaspert <joerg@debian.org>

Remove a tag

Signed-off-by: Joerg Jaspert <joerg@debian.org>

And one more path

Signed-off-by: Joerg Jaspert <joerg@debian.org>

And one more path

Signed-off-by: Joerg Jaspert <joerg@debian.org>

One more

Signed-off-by: Joerg Jaspert <joerg@debian.org>

New path stuff

Signed-off-by: Joerg Jaspert <joerg@debian.org>

More changes for franck

Signed-off-by: Joerg Jaspert <joerg@debian.org>

Merge branch 'master' into franck

* master:
  Add the apache configs

Add the apache configs

Signed-off-by: Joerg Jaspert <joerg@debian.org>

Merge branch 'master' into franck

* master:
  No more pgp keyring

No more pgp keyring

Signed-off-by: Joerg Jaspert <joerg@debian.org>

path changes

Signed-off-by: Joerg Jaspert <joerg@debian.org>

Merge remote branch 'drkranz/master' into merge

* drkranz/master:
  Add a newline between two changelog entries
  Check if upload already has a changelog entry
  Replace base_filename with os.path.basename

Signed-off-by: Joerg Jaspert <joerg@debian.org>

Add a newline between two changelog entries

Signed-off-by: Luca Falavigna <dktrkranz@debian.org>

Check if upload already has a changelog entry

Signed-off-by: Luca Falavigna <dktrkranz@debian.org>

Replace base_filename with os.path.basename

base_filename is not defined before, replace it with a function
to avoid generating a NameError exception

Signed-off-by: Luca Falavigna <dktrkranz@debian.org>

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>

Use sys.path.append to ensure proper environment

Signed-off-by: Luca Falavigna <dktrkranz@debian.org>

Merge remote branch 'drkranz/make-changelog' into merge

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

Signed-off-by: Joerg Jaspert <joerg@debian.org>

Add import_changelogs.py script

Signed-off-by: Luca Falavigna <dktrkranz@debian.org>

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>

Merge remote branch 'drkranz/master' into merge

* drkranz/master:
  Fix do_newer_version package detection

Signed-off-by: Joerg Jaspert <joerg@debian.org>

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>

Fix indentation

Signed-off-by: Luca Falavigna <dktrkranz@debian.org>

Implement changelogs for binNMUss too

Signed-off-by: Luca Falavigna <dktrkranz@debian.org>

Refactorize make-changelog handling, only for source uploads ATM

Signed-off-by: Luca Falavigna <dktrkranz@debian.org>

First implementation of make-changelog command

Signed-off-by: Luca Falavigna <dktrkranz@debian.org>

Whoops

Signed-off-by: Mark Hymers <mhy@debian.org>

Kill etch

Signed-off-by: Mark Hymers <mhy@debian.org>

We haven't used this in ages.  Please to be dying now

Signed-off-by: Mark Hymers <mhy@debian.org>

moved into own git

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

Signed-off-by: Joerg Jaspert <joerg@debian.org>

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>

kill make_suite_file_list

Signed-off-by: Mark Hymers <mhy@debian.org>

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>

don't convert changes file from utf-8 to ascii

Signed-off-by: Torsten Werner <twerner@debian.org>

color name fix

Signed-off-by: Joerg Jaspert <joerg@debian.org>

Partly revert the earlier commit and keep a recommends split

Signed-off-by: Joerg Jaspert <joerg@debian.org>

add more packages as we use them.

Signed-off-by: Joerg Jaspert <joerg@debian.org>

Move the recommends into depends, also add the -debversion package for postgres.

Signed-off-by: Joerg Jaspert <joerg@debian.org>

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>

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>

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>

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>

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>

Merge remote branch 'twerner/show-new' into merge

* twerner/show-new:
  fix show-new

Signed-off-by: Joerg Jaspert <joerg@debian.org>

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>

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>

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>

init_db.py: typo fix for `do_suite' comment.

s/Initalize/Initialize/

Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>

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>

fix show-new

Signed-off-by: Torsten Werner <twerner@debian.org>