[Collab-qa-commits] r1691 - in udd: . udd
Lucas Nussbaum
lucas at alioth.debian.org
Sun Feb 21 10:22:19 UTC 2010
Author: lucas
Date: 2010-02-21 10:22:16 +0000 (Sun, 21 Feb 2010)
New Revision: 1691
Modified:
udd/config-org.yaml
udd/udd/packages_gatherer.py
udd/udd/sources_gatherer.py
Log:
import debian-installer
Modified: udd/config-org.yaml
===================================================================
--- udd/config-org.yaml 2010-02-21 10:00:27 UTC (rev 1690)
+++ udd/config-org.yaml 2010-02-21 10:22:16 UTC (rev 1691)
@@ -39,7 +39,7 @@
archs: [alpha, amd64, arm, hppa, i386, ia64, mips,
mipsel, powerpc, s390, sparc]
directory: /org/mirrors/ftp.debian.org/ftp/dists/etch/
- components: [main, contrib, non-free]
+ components: [main, contrib, non-free, main/debian-installer, non-free/debian-installer]
distribution: debian
packages-table: packages
sources-table: sources
@@ -53,7 +53,7 @@
archs: [alpha, amd64, arm, hppa, i386, ia64, mips,
mipsel, powerpc, s390, sparc]
directory: /org/mirrors/ftp.debian.org/ftp/dists/etch-proposed-updates/
- components: [main, contrib, non-free]
+ components: [main, contrib, non-free, main/debian-installer]
distribution: debian
packages-table: packages
sources-table: sources
@@ -68,7 +68,7 @@
mipsel, powerpc, s390, sparc]
update-command: /org/udd.debian.org/udd/scripts/sync-dist.sh ftp.backports.org::backports.org/dists/etch-backports/ /org/udd.debian.org/mirrors/backports/etch
directory: /org/udd.debian.org/mirrors/backports/etch/
- components: [main, contrib, non-free]
+ components: [main, contrib, non-free, main/debian-installer]
distribution: debian-backports
packages-table: packages
sources-table: sources
@@ -140,7 +140,7 @@
i386, ia64, mips,
mipsel, powerpc, s390, sparc]
directory: /org/mirrors/ftp.debian.org/ftp/dists/lenny/
- components: [main, contrib, non-free]
+ components: [main, contrib, non-free, main/debian-installer, non-free/debian-installer]
distribution: debian
packages-table: packages
sources-table: sources
@@ -186,7 +186,7 @@
mipsel, powerpc, s390, sparc]
update-command: /org/udd.debian.org/udd/scripts/sync-dist.sh ftp.backports.org::backports.org/dists/lenny-backports/ /org/udd.debian.org/mirrors/backports/lenny
directory: /org/udd.debian.org/mirrors/backports/lenny/
- components: [main, contrib, non-free]
+ components: [main, contrib, non-free, main/debian-installer]
distribution: debian-backports
packages-table: packages
sources-table: sources
@@ -243,7 +243,7 @@
i386, ia64, mips,
mipsel, powerpc, s390, sparc, kfreebsd-amd64, kfreebsd-i386]
directory: /org/mirrors/ftp.debian.org/ftp/dists/squeeze/
- components: [main, contrib, non-free]
+ components: [main, contrib, non-free, main/debian-installer, non-free/debian-installer]
distribution: debian
packages-table: packages
sources-table: sources
@@ -289,7 +289,7 @@
i386, ia64, mips,
mipsel, powerpc, s390, sparc, kfreebsd-amd64, kfreebsd-i386]
directory: /org/mirrors/ftp.debian.org/ftp/dists/sid/
- components: [main, contrib, non-free]
+ components: [main, contrib, non-free, main/debian-installer, non-free/debian-installer]
distribution: debian
packages-table: packages
sources-table: sources
Modified: udd/udd/packages_gatherer.py
===================================================================
--- udd/udd/packages_gatherer.py 2010-02-21 10:00:27 UTC (rev 1690)
+++ udd/udd/packages_gatherer.py 2010-02-21 10:22:16 UTC (rev 1691)
@@ -32,8 +32,8 @@
'SHA1':0, 'Replaces':0, 'Section':0, 'MD5sum':0, 'Bugs':0, 'Priority':0,
'Tag':0, 'Task':0, 'Python-Version':0, 'Provides':0, 'Conflicts':0,
'SHA256':0, 'Original-Maintainer':0}
- ignorable = {'Filename':0, 'Npp-Filename':0, 'Npp-Name':0, 'Npp-Mimetype':0, 'Npp-Applications':0, 'Python-Runtime':0, 'Npp-File':0, 'Npp-Description':0, 'Url':0, 'Gstreamer-Elements':0, 'Gstreamer-Version':0, 'Gstreamer-Decoders':0, 'Gstreamer-Uri-Sinks':0, 'Gstreamer-Encoders':0, 'Gstreamer-Uri-Sources':0, 'url':0, 'Vdr-PatchLevel':0, 'Vdr-Patchlevel':0, 'originalmaintainer':0, 'Originalmaintainer':0, 'Build-Recommends':0, 'Multi-Arch':0, 'Maintainer-Homepage':0, 'Tads2-Version':0, 'Tads3-Version':0 }
- ignorable_re = re.compile("^(Orig-|Original-|Origianl-|Orginal-|Orignal-|Orgiinal-|Debian-|X-Original-|Upstream-)")
+ ignorable = {'Filename':0, 'Npp-Filename':0, 'Npp-Name':0, 'Npp-Mimetype':0, 'Npp-Applications':0, 'Python-Runtime':0, 'Npp-File':0, 'Npp-Description':0, 'Url':0, 'Gstreamer-Elements':0, 'Gstreamer-Version':0, 'Gstreamer-Decoders':0, 'Gstreamer-Uri-Sinks':0, 'Gstreamer-Encoders':0, 'Gstreamer-Uri-Sources':0, 'url':0, 'Vdr-PatchLevel':0, 'Vdr-Patchlevel':0, 'originalmaintainer':0, 'Originalmaintainer':0, 'Build-Recommends':0, 'Multi-Arch':0, 'Maintainer-Homepage':0, 'Tads2-Version':0, 'Tads3-Version':0, 'Xul-Appid': 0, 'Subarchitecture':0, 'Package-Type':0, 'Kernel-Version': 0, 'Installer-Menu-Item':0, 'Supported':0, 'subarchitecture':0, 'package-type':0 }
+ ignorable_re = re.compile("^(Orig-|Original-|Origianl-|Orginal-|Orignal-|Orgiinal-|Orginial-|Debian-|X-Original-|Upstream-)")
def __init__(self, connection, config, source):
@@ -95,7 +95,6 @@
# imported
t = control['Package'] + '_' + control['Version'] + '_' + control['Architecture']
if t in self.imported_all_pkgs:
- print "Already imported:" + t
continue
self.imported_all_pkgs[t] = 1
@@ -196,6 +195,7 @@
tmp.close()
except IOError, (e, message):
print "Could not read packages from %s: %s" % (path, message)
+ sys.exit(1)
cur.execute("DEALLOCATE package_insert")
# Fill the summary tables
cur.execute("DELETE FROM %s" % (table + '_summary'));
Modified: udd/udd/sources_gatherer.py
===================================================================
--- udd/udd/sources_gatherer.py 2010-02-21 10:00:27 UTC (rev 1690)
+++ udd/udd/sources_gatherer.py 2010-02-21 10:22:16 UTC (rev 1691)
@@ -31,7 +31,7 @@
'X-Vcs-Browser': 0, 'Vcs-Browser': 0, 'X-Vcs-Bzr': 0, 'X-Vcs-Darcs': 0, 'X-Vcs-Svn': 0, 'X-Vcs-Hg':0, 'X-Vcs-Git':0, 'Vcs-Browse':0,
'Directory':0, 'Comment':0, 'Origin':0, 'Url':0, 'X-Collab-Maint':0, 'Autobuild':0, 'Vcs-Cvs:':0, 'Python-Standards-Version':0, 'url':0, 'originalmaintainer':0, 'Originalmaintainer':0, 'Build-Recommends':0, 'Maintainer-Homepage': 0}
#Vcs-Cvs: is caused by a bug in python-debian, apparently.
- ignorable_re = re.compile("^(Orig-|Original-|Origianl-|Orginal-|Orignal-|Orgiinal-|Debian-|X-Original-|Upstream-)")
+ ignorable_re = re.compile("^(Orig-|Original-|Origianl-|Orginal-|Orignal-|Orgiinal-|Orginial-|Debian-|X-Original-|Upstream-)")
vcs = { 'Arch':0, 'Bzr':0, 'Cvs':0, 'Darcs':0, 'Git':0, 'Hg':0, 'Svn':0, 'Mtn':0}
def __init__(self, connection, config, source):
@@ -140,6 +140,8 @@
cur = self.cursor()
for comp in src_cfg['components']:
+ if re.search("debian-installer", comp):
+ continue # debian-installer components don't have source
path = os.path.join(src_cfg['directory'], comp, 'source', 'Sources.gz')
cur.execute("DELETE from %s WHERE Distribution = '%s' AND\
release = '%s' AND component = '%s'"\
@@ -179,6 +181,7 @@
tmp.close()
except IOError, (e, message):
print "Could not read packages from %s: %s" % (path, message)
+ sys.exit(1)
cur.execute("DEALLOCATE source_insert")
cur.execute("DEALLOCATE uploader_insert")
More information about the Collab-qa-commits
mailing list