← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~cjwatson/launchpad/remove-old-gina-files into lp:launchpad

 

Colin Watson has proposed merging lp:~cjwatson/launchpad/remove-old-gina-files into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/remove-old-gina-files/+merge/119267

In production, gina is only ever invoked by running scripts/gina.py.  The collection of scripts in lib/lp/soyuz/scripts/gina/scripts/ is obsolete, broken (at least without changes to default paths and the like), and serves mainly to sow confusion among people trying to work out how gina runs.

lib/lp/soyuz/scripts/gina/Changelog is horrendously outdated and doesn't serve any real need.

I also found an unused method and removed it while I was here.
-- 
https://code.launchpad.net/~cjwatson/launchpad/remove-old-gina-files/+merge/119267
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/remove-old-gina-files into lp:launchpad.
=== removed file 'lib/lp/soyuz/scripts/gina/Changelog'
--- lib/lp/soyuz/scripts/gina/Changelog	2005-10-31 18:29:12 +0000
+++ lib/lp/soyuz/scripts/gina/Changelog	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-2004-09-29 cprov:
-	
-	First usable release of Gina from Warty: Universe, Main and Restricted
-	More than 13K binaries and 7K sources working.
-	Waiting for DB improves for better handling GPG keys
-	
\ No newline at end of file

=== modified file 'lib/lp/soyuz/scripts/gina/handlers.py'
--- lib/lp/soyuz/scripts/gina/handlers.py	2012-07-24 06:39:54 +0000
+++ lib/lp/soyuz/scripts/gina/handlers.py	2012-08-12 14:09:21 +0000
@@ -258,10 +258,6 @@
     # Package stuff
     #
 
-    def ensure_sourcepackagename(self, name):
-        """Import only the sourcepackagename ensuring them."""
-        self.sphandler.ensureSourcePackageName(name)
-
     def preimport_sourcecheck(self, sourcepackagedata):
         """
         Check if this SourcePackageRelease already exists. This can

=== removed directory 'lib/lp/soyuz/scripts/gina/scripts'
=== removed file 'lib/lp/soyuz/scripts/gina/scripts/gina-loggrep'
--- lib/lp/soyuz/scripts/gina/scripts/gina-loggrep	2010-04-27 19:48:39 +0000
+++ lib/lp/soyuz/scripts/gina/scripts/gina-loggrep	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""
-gina-loggrep parses gina's logfile output format in an attempt to extract
-all the interesting and useful information from it.
-
-Essentially we elide all the uninteresting lines.
-"""
-
-import sys
-
-lastline = sys.stdin.readline()[:-1]
-
-plingplings = 0
-fmos = 0
-
-for line in sys.stdin:
-    line = line[:-1]
-    if "!!" in line:
-        plingplings += 1
-    if "FMO" in line:
-        fmos += 1
-        
-    if not lastline.startswith("- "):
-        print lastline
-    else:
-        if not line.startswith("- "):
-            print lastline
-
-    lastline = line
-
-print lastline
-
-print "PLINGPLING=%d\nFMO=%d" % (plingplings, fmos)

=== removed file 'lib/lp/soyuz/scripts/gina/scripts/reload-katie'
--- lib/lp/soyuz/scripts/gina/scripts/reload-katie	2009-06-30 21:27:34 +0000
+++ lib/lp/soyuz/scripts/gina/scripts/reload-katie	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-SRV=/srv/archive.ubuntu.com
-
-createdb katie2
-
-psql katie2 < $SRV/projectb.dump
-
-echo 'drop database katie; create database katie with template katie2; drop database katie2' | psql template1
-

=== removed file 'lib/lp/soyuz/scripts/gina/scripts/reload-katie.example'
--- lib/lp/soyuz/scripts/gina/scripts/reload-katie.example	2009-06-30 21:27:34 +0000
+++ lib/lp/soyuz/scripts/gina/scripts/reload-katie.example	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-SRV=/home/debonzi/Warthogs/mirror
-
-createdb katie2
-
-psql katie2 < $SRV/projectb.dump
-
-echo 'drop database katie; create database katie with template katie2; drop database katie2' | psql template1
-

=== removed file 'lib/lp/soyuz/scripts/gina/scripts/run-gina'
--- lib/lp/soyuz/scripts/gina/scripts/run-gina	2009-06-30 21:27:34 +0000
+++ lib/lp/soyuz/scripts/gina/scripts/run-gina	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-SRV=/srv/staging.launchpad.net
-
-cd $SRV
-
-LOG=$SRV/logs
-
-DATE=`date "+%Y%m%d%H%M%S"`
-
-LPL=$SRV/launchpad-dogfood/lib
-#LPL=/home/dsilvers/newpad/lib
-
-GINA=$LPL/lp/soyuz/scripts/gina
-
-($GINA/scripts/reload-katie 2>&1) > $LOG/katie-reload.$DATE
-
-(PYTHONPATH=$LPL python -u $GINA/grabber.py \
-                           --distro=ubuntu \
-                           --distroseries=hoary \
-                           --arch=i386,amd64,powerpc \
-                           --components=main,restricted,universe \
-                           --run \
-                 2>&1) | tee $LOG/gina.$DATE | \
-                 $GINA/scripts/gina-loggrep > $LOG/gina.$DATE.summary

=== removed file 'lib/lp/soyuz/scripts/gina/scripts/run-gina-zopeless.example'
--- lib/lp/soyuz/scripts/gina/scripts/run-gina-zopeless.example	2009-06-30 21:27:34 +0000
+++ lib/lp/soyuz/scripts/gina/scripts/run-gina-zopeless.example	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-SRV=/home/debonzi/Warthogs/projects/branches
-
-cd $SRV
-
-LOG=$SRV/logs
-
-DATE=`date "+%Y%m%d%H%M%S"`
-
-LPL=$SRV/launchpad--gina--0/lib
-
-GINA=$LPL/lp/soyuz/scripts/gina
-
-export LP_DBNAME=launchpad_dev
-export LP_DBHOST=localhost
-export LP_DBUSER=debonzi
-
-#($GINA/scripts/reload-katie.example 2>&1) > $LOG/katie-reload.$DATE
-
-(PYTHONPATH=$LPL python -u $GINA/grabber.py \
-                           --distro=ubuntu \
-                           --distroseries=hoary \
-                           --arch=i386 \
-                           --components=main \
-                           --launchpad=launchpad_dev \
-                           --keyrings=/home/debonzi/Warthogs/keyring.ubuntu.com/keyrings \
-                           --root=/home/debonzi/Warthogs/mirror \
-                           --run) # | tee $LOG/gina.$DATE | \
-                                  # $GINA/scripts/gina-loggrep > $LOG/gina.$DATE.summary
-

=== removed file 'lib/lp/soyuz/scripts/gina/scripts/run-newgina.sh'
--- lib/lp/soyuz/scripts/gina/scripts/run-newgina.sh	2009-06-30 21:06:27 +0000
+++ lib/lp/soyuz/scripts/gina/scripts/run-newgina.sh	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-SRV=/home/debonzi/Warthogs/projects
-
-cd $SRV
-
-LOG=$SRV/logs
-
-DATE=`date "+%Y%m%d%H%M%S"`
-
-LPL=$SRV/branches/gina/launchpad/lib
-
-GINA=$LPL/lp/soyuz/scripts/gina
-
-export LP_DBNAME=launchpad_dev
-export LP_DBHOST=localhost
-export LP_DBUSER=launchpad
-
-#($GINA/scripts/reload-katie.example 2>&1) > $LOG/katie-reload.$DATE
-
-(PYTHONPATH=$LPL python -u $GINA/gina.py \
-                           --distro=ubuntu \
-                           --distroseries=hoary \
-                           --arch=i386 \
-                           --components=main \
-                           --keyrings=/home/debonzi/Warthogs/keyring.ubuntu.com/keyrings \
-                           --root=/home/debonzi/Warthogs/mirror \
-                           --run) | tee $LOG/gina.$DATE


Follow ups