Merge into db-devel : buildjob-nagios-check-perms : Code : Launchpad itself

Status:

Merged

Approved by:

Aaron Bentley on 2010-01-04

Approved revision:

not available

Merged at revision:

not available

Proposed branch:

lp:~mthaddon/launchpad/buildjob-nagios-check-perms

Merge into:

lp:launchpad/db-devel

Diff against target:

15 lines (+5/-0)

1 file modified

database/schema/security.cfg (+5/-0)

To merge this branch:

bzr merge lp:~mthaddon/launchpad/buildjob-nagios-check-perms

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Aaron Bentley (community)		2009-12-23	Approve on 2010-01-04
Review via email: mp+16532@code.launchpad.net

Revision history for this message

Tom Haddon (mthaddon) wrote on 2009-12-23:

#

Permissions needed by a nagios check for whether there are build jobs that have started but don't have a builder assigned - obsolete once bug 499421 is fixed

Revision history for this message

Aaron Bentley (abentley) wrote on 2010-01-04:

#

Download full text (19.8 KiB)

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Tom Haddon wrote:
> Tom Haddon has proposed merging lp:~mthaddon/launchpad/buildjob-nagios-check-perms into lp:launchpad.
>
> Requested reviews:
> Canonical Launchpad Engineering (launchpad)
>
>
> Permissions needed by a nagios check for whether there are build jobs that have started but don't have a builder assigned - obsolete once bug 499421 is fixed
>
>

I need to ask some questions because this isn't in our standard format
for review requests:

1. Was there a pre-implementation call?
2. Did you run "make lint", and was the output clean?

> === modified file 'cronscripts/librarian-gc.py'
> --- cronscripts/librarian-gc.py 2009-11-25 08:53:00 +0000
> +++ cronscripts/librarian-gc.py 2009-12-23 11:42:26 +0000
> @@ -51,6 +51,12 @@
> help="Skip removing files on disk with no database references"
> " or flagged for deletion."
> )
> + self.parser.add_option(
> + '', "--skip-expiry", action="store_true", default=False,
> + dest="skip_expiry",
> + help="Skip expiring aliases with an expiry date in the past."
> + )

How does this relate to the permissions issue?

> +
>
> def main(self):
> librariangc.log = self.logger
> @@ -66,6 +72,8 @@
>
> # Note that each of these next steps will issue commit commands
> # as appropriate to make this script transaction friendly
> + if not self.options.skip_expiry:
> + librariangc.expire_aliases(conn)
> if not self.options.skip_content:
> librariangc.delete_unreferenced_content(conn) # first sweep
> if not self.options.skip_blobs:
>
> === modified file 'database/schema/security.cfg'
> --- database/schema/security.cfg 2009-12-22 09:37:00 +0000
> +++ database/schema/security.cfg 2009-12-23 11:42:26 +0000
> @@ -1838,6 +1838,11 @@
>
> [nagios]
> type=user
> +public.archive = SELECT
> +public.build = SELECT
> +public.buildqueue = SELECT
> +public.buildpackagejob = SELECT
> +public.job = SELECT
> public.libraryfilecontent = SELECT
> public.openidrpconfig = SELECT
> public.branch = SELECT
>
> === modified file 'lib/canonical/librarian/ftests/test_gc.py'
> --- lib/canonical/librarian/ftests/test_gc.py 2009-11-25 08:53:00 +0000
> +++ lib/canonical/librarian/ftests/test_gc.py 2009-12-23 11:42:26 +0000
> @@ -55,6 +55,22 @@
> self.client = LibrarianClient()
> librariangc.log = MockLogger()
>
> + # A value we use in a number of tests. This represents the
> + # stay of execution hard coded into the garbage collector.
> + # We don't destroy any data unless it has been waiting to be
> + # destroyed for longer than this period. We pick a value
> + # that is close enough to the stay of execution so that
> + # forgetting timezone information will break things, but
> + # far enough so that how long it takes the test to...

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Tom Haddon wrote:
> Tom Haddon has proposed merging lp:~mthaddon/launchpad/buildjob-nagios-check-perms into lp:launchpad.
> 
>     Requested reviews:
>     Canonical Launchpad Engineering (launchpad)
> 
> 
> Permissions needed by a nagios check for whether there are build jobs that have started but don't have a builder assigned - obsolete once bug 499421 is fixed
> 
>

I need to ask some questions because this isn't in our standard format
for review requests:

1. Was there a pre-implementation call?
2. Did you run "make lint", and was the output clean?

> === modified file 'cronscripts/librarian-gc.py'
> --- cronscripts/librarian-gc.py	2009-11-25 08:53:00 +0000
> +++ cronscripts/librarian-gc.py	2009-12-23 11:42:26 +0000
> @@ -51,6 +51,12 @@
>                  help="Skip removing files on disk with no database references"
>                       " or flagged for deletion."
>                  )
> +        self.parser.add_option(
> +                '', "--skip-expiry", action="store_true", default=False,
> +                dest="skip_expiry",
> +                help="Skip expiring aliases with an expiry date in the past."
> +                )

How does this relate to the permissions issue?

> +
>  
>      def main(self):
>          librariangc.log = self.logger
> @@ -66,6 +72,8 @@
>  
>          # Note that each of these next steps will issue commit commands
>          # as appropriate to make this script transaction friendly
> +        if not self.options.skip_expiry:
> +            librariangc.expire_aliases(conn)
>          if not self.options.skip_content:
>              librariangc.delete_unreferenced_content(conn) # first sweep
>          if not self.options.skip_blobs:
> 
> === modified file 'database/schema/security.cfg'
> --- database/schema/security.cfg	2009-12-22 09:37:00 +0000
> +++ database/schema/security.cfg	2009-12-23 11:42:26 +0000
> @@ -1838,6 +1838,11 @@
>  
>  [nagios]
>  type=user
> +public.archive                          = SELECT
> +public.build                            = SELECT
> +public.buildqueue                       = SELECT
> +public.buildpackagejob                  = SELECT
> +public.job                              = SELECT
>  public.libraryfilecontent               = SELECT
>  public.openidrpconfig                   = SELECT
>  public.branch                           = SELECT
> 
> === modified file 'lib/canonical/librarian/ftests/test_gc.py'
> --- lib/canonical/librarian/ftests/test_gc.py	2009-11-25 08:53:00 +0000
> +++ lib/canonical/librarian/ftests/test_gc.py	2009-12-23 11:42:26 +0000
> @@ -55,6 +55,22 @@
>          self.client = LibrarianClient()
>          librariangc.log = MockLogger()
>  
> +        # A value we use in a number of tests. This represents the
> +        # stay of execution hard coded into the garbage collector.
> +        # We don't destroy any data unless it has been waiting to be
> +        # destroyed for longer than this period. We pick a value
> +        # that is close enough to the stay of execution so that
> +        # forgetting timezone information will break things, but
> +        # far enough so that how long it takes the test to run
> +        # is not an issue. 'stay_of_excution - 1 hour' fits these
> +        # criteria.
> +        self.recent_past = (
> +            datetime.utcnow().replace(tzinfo=utc)
> +            - timedelta(days=6, hours=23))
> +        # A time beyond the stay of execution.
> +        self.ancient_past = (
> +            datetime.utcnow().replace(tzinfo=utc) - timedelta(days=30))
> +
>          self.f1_id, self.f2_id = self._makeDupes()
>  
>          self.layer.switchDbUser(config.librarian_gc.dbuser)
> @@ -66,12 +82,6 @@
>          path = librariangc.get_file_path(self.f1_id)
>          self.failUnless(os.path.exists(path), "Librarian uploads failed")
>  
> -        # A value we use in a number of tests
> -        self.recent_past = (
> -                datetime.utcnow().replace(tzinfo=utc)
> -                - timedelta(days=6, hours=23)
> -                )
> -
>          # Make sure that every file the database knows about exists on disk.
>          # We manually remove them for tests that need to cope with missing
>          # library items.
> @@ -124,14 +134,12 @@
>  
>          # Set the last accessed time into the past so they will be garbage
>          # collected
> -        past = datetime.utcnow() - timedelta(days=30)
> -        past = past.replace(tzinfo=utc)
> -        f1.last_accessed = past
> -        f2.last_accessed = past
> -        f1.date_created = past
> -        f2.date_created = past
> -        f1.content.datecreated = past
> -        f2.content.datecreated = past
> +        f1.last_accessed = self.ancient_past
> +        f2.last_accessed = self.ancient_past
> +        f1.date_created = self.ancient_past
> +        f2.date_created = self.ancient_past
> +        f1.content.datecreated = self.ancient_past
> +        f2.content.datecreated = self.ancient_past
>  
>          del f1, f2
>  
> @@ -219,8 +227,7 @@
>          # Flag one of our LibraryFileAliases with an expiry date in the past
>          self.ztm.begin()
>          f1 = LibraryFileAlias.get(self.f1_id)
> -        past = datetime.utcnow().replace(tzinfo=utc) - timedelta(days=30)
> -        f1.expires = past
> +        f1.expires = self.ancient_past
>          del f1
>          self.ztm.commit()
>  
> @@ -261,6 +268,52 @@
>          # Our recently expired LibraryFileAlias is still available.
>          LibraryFileAlias.get(self.f1_id)
>  
> +    def test_deleteWellExpiredAliases(self):
> +        # LibraryFileAlias records that are expired are unlinked from their
> +        # content.
> +
> +        # Flag one of our LibraryFileAliases with an expiry date in the past
> +        self.ztm.begin()
> +        f1 = LibraryFileAlias.get(self.f1_id)
> +        f1.expires = self.ancient_past
> +        del f1
> +        self.ztm.commit()
> +
> +        # Unlink expired LibraryFileAliases.
> +        librariangc.expire_aliases(self.con)
> +
> +        self.ztm.begin()
> +        # Make sure the well expired f1 is still there, but has no content.
> +        f1 = LibraryFileAlias.get(self.f1_id)
> +        self.assert_(f1.content is None)
> +        # f2 should still have content, as it isn't flagged for expiry.
> +        f2 = LibraryFileAlias.get(self.f2_id)
> +        self.assert_(f2.content is not None)
> +
> +    def test_ignoreRecentlyExpiredAliases(self):
> +        # LibraryFileAlias records that have expired recently are not
> +        # garbage collected.
> +
> +        # Flag one of our LibraryFileAliases with an expiry date in the
> +        # recent past.
> +        self.ztm.begin()
> +        f1 = LibraryFileAlias.get(self.f1_id)
> +        f1.expires = self.recent_past # Within stay of execution.
> +        del f1
> +        self.ztm.commit()
> +
> +        # Unlink expired LibraryFileAliases.
> +        librariangc.expire_aliases(self.con)
> +
> +        self.ztm.begin()
> +        # Make sure f1 is still there and has content. This ensures that
> +        # our stay of execution is still working.
> +        f1 = LibraryFileAlias.get(self.f1_id)
> +        self.assert_(f1.content is not None)
> +        # f2 should still have content, as it isn't flagged for expiry.
> +        f2 = LibraryFileAlias.get(self.f2_id)
> +        self.assert_(f2.content is not None)
> +
>      def test_DeleteUnreferencedContent(self):
>          # Merge the duplicates. This creates an
>          # unreferenced LibraryFileContent
>

How do these changes relate to the permission changes?

> === modified file 'lib/canonical/librarian/librariangc.py'
> --- lib/canonical/librarian/librariangc.py	2009-11-25 13:47:07 +0000
> +++ lib/canonical/librarian/librariangc.py	2009-12-23 11:42:26 +0000
> @@ -182,6 +182,55 @@
>          con.commit()
>  
>  
> +class ExpireAliases:
> +    """Expire expired LibraryFileAlias records.
> +
> +    This simply involves setting the LibraryFileAlias.content to NULL.
> +    Unreferenced LibraryFileContent records are cleaned up elsewhere.
> +    """
> +    implements(ITunableLoop)
> +
> +    def __init__(self, con):
> +        self.con = con
> +        self.total_expired = 0
> +        self._done = False
> +
> +    def isDone(self):
> +        if self._done:
> +            log.info(
> +                "Expired %d LibraryFileAlias records." % self.total_expired)
> +            return True
> +        else:
> +            return False
> +
> +    def __call__(self, chunksize):
> +        chunksize = int(chunksize)
> +        cur = self.con.cursor()
> +        cur.execute("""
> +            UPDATE LibraryFileAlias
> +            SET content=NULL
> +            WHERE id IN (
> +                SELECT id FROM LibraryFileAlias
> +                WHERE
> +                    content IS NOT NULL
> +                    AND expires < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'
> +                        - interval '1 week'
> +                LIMIT %d)
> +            """ % chunksize)
> +        self.total_expired += cur.rowcount
> +        if cur.rowcount == 0:
> +            self._done = True
> +        else:
> +            log.debug("Expired %d LibraryFileAlias records." % cur.rowcount)
> +        self.con.commit()
> +
> +
> +def expire_aliases(con):
> +    """Invoke ExpireLibraryFileAliases."""
> +    loop_tuner = DBLoopTuner(ExpireAliases(con), 5, log=log)
> +    loop_tuner.run()
> +
> +
>  class UnreferencedLibraryFileAliasPruner:
>      """Delete unreferenced LibraryFileAliases.
>  
>

How does this change relate to the permission changes?

> === renamed directory 'lib/lp/archiveuploader/tests/data/suite/debug_1.0' => 'lib/lp/archiveuploader/tests/data/suite/debug_1.0-1'
> === added file 'lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug-bin-dbgsym_1.0-1_i386.ddeb'
> Binary files lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug-bin-dbgsym_1.0-1_i386.ddeb	1970-01-01 00:00:00 +0000 and lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug-bin-dbgsym_1.0-1_i386.ddeb	2009-12-23 11:42:26 +0000 differ
> === renamed file 'lib/lp/archiveuploader/tests/data/suite/debug_1.0/debug-bin_1.0_i386.deb' => 'lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug-bin_1.0-1_i386.deb'
> Binary files lib/lp/archiveuploader/tests/data/suite/debug_1.0/debug-bin_1.0_i386.deb	2009-04-15 13:45:42 +0000 and lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug-bin_1.0-1_i386.deb	2009-12-23 11:42:26 +0000 differ
> === renamed file 'lib/lp/archiveuploader/tests/data/suite/debug_1.0/debug_1.0.dsc' => 'lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug_1.0-1.dsc'
> --- lib/lp/archiveuploader/tests/data/suite/debug_1.0/debug_1.0.dsc	2009-04-15 13:45:42 +0000
> +++ lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug_1.0-1.dsc	2009-12-23 11:42:26 +0000
> @@ -1,13 +1,13 @@
>  Format: 1.0
>  Source: debug
> -Binary: debug-bin, debug-dbg
> +Binary: debug-bin, debug-bin-dbgsym
>  Architecture: any
> -Version: 1.0
> +Version: 1.0-1
>  Maintainer: Launchpad team <launchpad@lists.canonical.com>
>  Standards-Version: 3.6.2
>  Checksums-Sha1: 
> - f1b127517fca94cd06444d452ce32a68fbe24c93 744 debug_1.0.tar.gz
> + 6851f625a32f6c83a1af4c972b5bead14fbee06c 740 debug_1.0-1.tar.gz
>  Checksums-Sha256: 
> - 95537a19d65855ea42695589d8f876e6d4390c906583de7cd4a16842b303d440 744 debug_1.0.tar.gz
> + 1a1ed198644169f16eeee93c843ab8b7d9eef25cd91b83f55f497dbe744d3c95 740 debug_1.0-1.tar.gz
>  Files: 
> - 499069ad47e21b7dde887b46eada8972 744 debug_1.0.tar.gz
> + 8225b515f30dd8c0252847f17f4b7069 740 debug_1.0-1.tar.gz
> 
> === renamed file 'lib/lp/archiveuploader/tests/data/suite/debug_1.0/debug_1.0.tar.gz' => 'lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug_1.0-1.tar.gz'
> Binary files lib/lp/archiveuploader/tests/data/suite/debug_1.0/debug_1.0.tar.gz	2009-04-15 13:45:42 +0000 and lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug_1.0-1.tar.gz	2009-12-23 11:42:26 +0000 differ
> === renamed file 'lib/lp/archiveuploader/tests/data/suite/debug_1.0/debug_1.0_i386.changes' => 'lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug_1.0-1_i386.changes'
> --- lib/lp/archiveuploader/tests/data/suite/debug_1.0/debug_1.0_i386.changes	2009-05-11 20:55:01 +0000
> +++ lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug_1.0-1_i386.changes	2009-12-23 11:42:26 +0000
> @@ -3,7 +3,7 @@
>  Source: debug
>  Binary: debug-bin
>  Architecture: i386
> -Version: 1.0
> +Version: 1.0-1
>  Distribution: hoary
>  Urgency: low
>  Maintainer: Launchpad team <launchpad@lists.canonical.com>
> @@ -11,10 +11,15 @@
>  Description: 
>   debug-bin  - Stuff for testing
>  Changes: 
> - debug (1.0) hoary; urgency=low
> + debug (1.0-1) hoary; urgency=low
>   .
>     * Testing debug binaries
> +Checksums-Sha1: 
> + 91556113ad38eb35d2fe03d27ae646e0ed487a3d 654 debug-bin_1.0-1_i386.deb
> + d120be63a4535e31ec08657cc4d3018cc8b62d54 668 debug-bin-dbgsym_1.0-1_i386.ddeb
> +Checksums-Sha256: 
> + 5ca0ce3d3bfde3cc698d9ad4b027663abecb958bea641d29ac3bf8333fd3ebad 654 debug-bin_1.0-1_i386.deb
> + 9c0013badb1bb78fa1ccbf1508398cbf51904f7242d8931f4994c1aa18519b63 668 debug-bin-dbgsym_1.0-1_i386.ddeb
>  Files: 
> - 88eae94b28fcffdbfaeb520549f81d1d 654 devel optional debug-bin_1.0_i386.deb
> - 0ab4cf3b1b0422192c41060d903c3f51 664 devel optional debug-dbg_1.0_i386.ddeb
> -
> + 48b4eed5980c754cc74a06ffc4372f64 654 devel optional debug-bin_1.0-1_i386.deb
> + ac5c44025ffc026485b22722e0f13804 668 devel optional debug-bin-dbgsym_1.0-1_i386.ddeb
>

How do these changes relate to the permission changes?

> === renamed file 'lib/lp/archiveuploader/tests/data/suite/debug_1.0/debug_1.0_source.changes' => 'lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug_1.0-1_source.changes'
> --- lib/lp/archiveuploader/tests/data/suite/debug_1.0/debug_1.0_source.changes	2009-04-15 13:45:42 +0000
> +++ lib/lp/archiveuploader/tests/data/suite/debug_1.0-1/debug_1.0-1_source.changes	2009-12-23 11:42:26 +0000
> @@ -1,20 +1,26 @@
>  Format: 1.8
>  Date: Thu, 15 Apr 2009 15:14:09 +0100
>  Source: debug
> -Binary: debug-bin debug-dbg
> +Binary: debug-bin debug-bin-dbgsym
>  Architecture: source
> -Version: 1.0
> +Version: 1.0-1
>  Distribution: hoary
>  Urgency: low
>  Maintainer: Launchpad team <launchpad@lists.canonical.com>
>  Changed-By: Celso Providelo <cprov@canonical.com>
>  Description: 
>   debug-bin  - Stuff for testing
> - debug-dbg  - Stuff for testing DDEBs
> + debug-bin-dbgsym - Stuff for testing DDEBs
>  Changes: 
> - debug (1.0) hoary; urgency=low
> + debug (1.0-1) hoary; urgency=low
>   .
>     * Testing debug binaries
> +Checksums-Sha1: 
> + f30c2462e897e07534a5c9960a8f653d5a51b066 434 debug_1.0-1.dsc
> + 6851f625a32f6c83a1af4c972b5bead14fbee06c 740 debug_1.0-1.tar.gz
> +Checksums-Sha256: 
> + ab5e1eea2551828761d8734224d1a024be401ac05e83010494a0d9c69b8982c3 434 debug_1.0-1.dsc
> + 1a1ed198644169f16eeee93c843ab8b7d9eef25cd91b83f55f497dbe744d3c95 740 debug_1.0-1.tar.gz
>  Files: 
> - f9361791f0d81a607f6b4ce911fdbb0d 419 devel optional debug_1.0.dsc
> - 499069ad47e21b7dde887b46eada8972 744 devel optional debug_1.0.tar.gz
> + 81d19cae151472dfd2f797a69a2c1f54 434 devel optional debug_1.0-1.dsc
> + 8225b515f30dd8c0252847f17f4b7069 740 devel optional debug_1.0-1.tar.gz
> 
> === removed file 'lib/lp/archiveuploader/tests/data/suite/debug_1.0/debug-dbg_1.0_i386.ddeb'
> Binary files lib/lp/archiveuploader/tests/data/suite/debug_1.0/debug-dbg_1.0_i386.ddeb	2009-04-15 13:45:42 +0000 and lib/lp/archiveuploader/tests/data/suite/debug_1.0/debug-dbg_1.0_i386.ddeb	1970-01-01 00:00:00 +0000 differ
> === modified file 'lib/lp/archiveuploader/tests/nascentupload-ddebs.txt'
> --- lib/lp/archiveuploader/tests/nascentupload-ddebs.txt	2009-05-06 20:53:05 +0000
> +++ lib/lp/archiveuploader/tests/nascentupload-ddebs.txt	2009-12-23 11:42:26 +0000
> @@ -11,8 +11,8 @@
>  
>  First we will create a source and a corresponding binary publication
>  in the database, 'debug' and 'debug-bin' version '0.9', which will be
> -an ancestor for the subsequent upload containing a 'debug-dbg' DDEB.
> -This is done using `SoyuzTestPublisher`.
> +an ancestor for the subsequent upload containing a 'debug-bin-dbgsym'
> +DDEB. This is done using `SoyuzTestPublisher`.
>  
>      >>> from lp.soyuz.tests.test_publishing import (
>      ...     SoyuzTestPublisher)
> @@ -43,28 +43,28 @@
>      >>> LaunchpadZopelessLayer.txn.commit()
>      >>> LaunchpadZopelessLayer.switchDbUser('uploader')
>  
> -With that done, we now upload a new source, 'debug - 1.0', which is
> +With that done, we now upload a new source, 'debug - 1.0-1', which is
>  immediately accepted and stands pending publication.
>  
>      >>> src = getUploadForSource(
> -    ...     'suite/debug_1.0/debug_1.0_source.changes')
> +    ...     'suite/debug_1.0-1/debug_1.0-1_source.changes')
>      >>> src.process()
>      >>> result = src.do_accept()
>      >>> print src.queue_root.status.name
>      DONE
>  
>      >>> [src_pub] = src.queue_root.archive.getPublishedSources(
> -    ...     name='debug', version='1.0', exact_match=True)
> +    ...     name='debug', version='1.0-1', exact_match=True)
>  
>      >>> print src_pub.displayname, src_pub.status.name
> -    debug 1.0 in hoary PENDING
> +    debug 1.0-1 in hoary PENDING
>  
>  At this point a deb and a ddeb, produced during a normal build
>  process, are uploaded. This is exactly the same procedure used for
>  binary uploads with only ordinary debs.
>  
>      >>> bin = getUploadForBinary(
> -    ...     'suite/debug_1.0/debug_1.0_i386.changes')
> +    ...     'suite/debug_1.0-1/debug_1.0-1_i386.changes')
>  
>  DDEBs undergo exactly the same checks as ordinary DEBs. These are
>  never considered NEW, so the binary upload has a 'never-seen-before'
> @@ -91,8 +91,8 @@
>      ...     print '%s %s %s' % (
>      ...         bin_pub.displayname, bin_pub.status.name,
>      ...         bin_pub.archive.purpose.name)
> -    debug-bin 1.0 in hoary i386 PENDING PRIMARY
> -    debug-dbg 1.0 in hoary i386 PENDING DEBUG
> +    debug-bin 1.0-1 in hoary i386 PENDING PRIMARY
> +    debug-bin-dbgsym 1.0-1 in hoary i386 PENDING DEBUG
>  
>  DEBs and DDEBs are uploaded to separate archives, because the size
>  impact of uploading them to a single archive on mirrors would be
> @@ -104,7 +104,7 @@
>      >>> ddeb = ddeb_pub.binarypackagerelease
>  
>      >>> print ddeb.title
> -    debug-dbg-1.0
> +    debug-bin-dbgsym-1.0-1
>  
>  The corresponding `BinaryPackageRelease` is recorded with DDEB format.
>  
> @@ -115,7 +115,7 @@
>  
>      >>> for bin_file in ddeb.files:
>      ...     print bin_file.libraryfile.filename, bin_file.filetype.name
> -    debug-dbg_1.0_i386.ddeb DDEB
> +    debug-bin-dbgsym_1.0-1_i386.ddeb DDEB
>  
>  
>  == DDEBs in other archives ==
> @@ -144,15 +144,15 @@
>      ...     binaryname='debug-bin', pub_source=copied_source, archive=copy)
>  
>      >>> src_pub = test_publisher.getPubSource(
> -    ...     sourcename='debug', version='1.0', archive=copy)
> +    ...     sourcename='debug', version='1.0-1', archive=copy)
>  
>      >>> print src_pub.displayname, src_pub.status.name
> -    debug 1.0 in hoary PENDING
> +    debug 1.0-1 in hoary PENDING
>  
>  Now we upload the DEB and the DDEB, which are auto-accepted.
>  
>      >>> bin = getUploadForBinary(
> -    ...     'suite/debug_1.0/debug_1.0_i386.changes')
> +    ...     'suite/debug_1.0-1/debug_1.0-1_i386.changes')
>      >>> bin.policy.archive = copy
>  
>      >>> bin.process()
> @@ -175,6 +175,6 @@
>      ...     print '%s %s %s' % (
>      ...         bin_pub.displayname, bin_pub.status.name,
>      ...         bin_pub.archive.purpose.name)
> -    debug-bin 1.0 in hoary i386 PENDING COPY
> -    debug-dbg 1.0 in hoary i386 PENDING COPY
> +    debug-bin 1.0-1 in hoary i386 PENDING COPY
> +    debug-bin-dbgsym 1.0-1 in hoary i386 PENDING COPY

How do these changes relate to the permission changes?

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAktCC1EACgkQ0F+nu1YWqI0m+QCeKnD8dq83uMiRzPmiiDw7Gqt7
QwIAn2iUMYk+8RLQjGOkCx3Gkvx28//I
=FNo8
-----END PGP SIGNATURE-----

Revision history for this message

Aaron Bentley (abentley) on 2010-01-04:

#

review: Needs Information

Revision history for this message

Tom Haddon (mthaddon) wrote on 2010-01-04:

#

I think this was a case of operator error - I branched off devel and so I think it shows a bunch of irrelevant changes - have fixed to branch off db-devel and re-pushed. The only change should be to database/schema/security.cfg

Thanks, Tom

Revision history for this message

Aaron Bentley (abentley) wrote on 2010-01-04:

#

> I think this was a case of operator error - I branched off devel and so I
> think it shows a bunch of irrelevant changes - have fixed to branch off db-
> devel and re-pushed. The only change should be to database/schema/security.cfg

Ah, much better.

Aaron

review: Approve

Launchpad itself

Merge lp:~mthaddon/launchpad/buildjob-nagios-check-perms into lp:launchpad/db-devel

Commit message

Description of the change

Preview Diff

Subscribers

1	=== modified file 'database/schema/security.cfg'
2	--- database/schema/security.cfg 2009-12-22 09:37:00 +0000
3	+++ database/schema/security.cfg 2010-01-04 16:01:15 +0000
4	@@ -1838,6 +1838,11 @@
5
6	[nagios]
7	type=user
8	+public.archive = SELECT
9	+public.build = SELECT
10	+public.buildqueue = SELECT
11	+public.buildpackagejob = SELECT
12	+public.job = SELECT
13	public.libraryfilecontent = SELECT
14	public.openidrpconfig = SELECT
15	public.branch = SELECT