Merge lp:~delqn/merge-o-matic/augmented-config into lp:merge-o-matic

[Delyan Raychev]

Created an additional file to hold all distro-specific parameters. momlib.py will now depend on the configuration file for proper server names, emal addresses etc.

Augmented hard-coded distribution specific values into a python configuration file. Added mom.config and config.sh

With these changes other GNU/Linux distributions would be able to quickly and easily adapt merge-o-matic to their needs.

[lp:~delqn/merge-o-matic/augmented-config]

172. By Delyan Raychev on 2010-04-05

Rename config.py to mom.conf

173. By Delyan Raychev on 2010-06-22

Committing newly added files

174. By Delyan Raychev on 2010-06-22

Committing newly added files - mom.conf, config.sh

175. By Delyan Raychev on 2010-06-22

Switching mom.conf to maverick

Unmerged revisions

175. By Delyan Raychev on 2010-06-22

Switching mom.conf to maverick

174. By Delyan Raychev on 2010-06-22

Committing newly added files - mom.conf, config.sh

173. By Delyan Raychev on 2010-06-22

Committing newly added files

172. By Delyan Raychev on 2010-04-05

Rename config.py to mom.conf

171. By Delyan Raychev <de@pelin> on 2010-03-30

Augmenting hardcoded distro-specific values to a config file; adding config.py and config.sh

=== added file 'config.sh'
--- config.sh	1970-01-01 00:00:00 +0000
+++ config.sh	2010-06-22 18:57:26 +0000
@@ -0,0 +1,7 @@
+# Config file for cron jobs/shell scripts
+workingdir="/srv/patches.ubuntu.com/"
+publichost="https://merges.ubuntu.com/"
+blacklisturi="http://people.ubuntu.com/~ubuntu-archive/sync-blacklist.txt"
+dist_upstream="debian"
+dist_ours="ubuntu"
+rsync_remote="casey.ubuntu.com"

=== modified file 'cron.daily'
--- cron.daily	2009-12-22 17:54:08 +0000
+++ cron.daily	2010-06-22 18:57:26 +0000
@@ -19,28 +19,30 @@
 set -e
 umask 002
 
+. config.sh
+
 if [ "$DEBUG" = "y" ]; then
 	QUIET=""
 else
 	QUIET="-q"
 
-	if ! mkdir /srv/patches.ubuntu.com/.lock 2>/dev/null; then
+	if ! mkdir $workingdir/.lock 2>/dev/null; then
 		echo "LOCKED (another one running?)"
 		exit 1
 	fi
-	trap "rmdir /srv/patches.ubuntu.com/.lock" 0
+	trap "rmdir $workingdir/.lock" 0
 fi
 
-cd /srv/patches.ubuntu.com/code
+cd $workingdir/code
 #bzr update
 
-cp addcomment.py /srv/patches.ubuntu.com/merges
+cp addcomment.py $workingdir/merges
 
 # Update the blacklist
-wget -q -O/srv/patches.ubuntu.com/sync-blacklist.txt http://people.ubuntu.com/~ubuntu-archive/sync-blacklist.txt
+wget -q -O$workingdir/sync-blacklist.txt $blacklisturi
 
 # Download new packages
-./update-pool.py $QUIET debian ubuntu
+./update-pool.py $QUIET $distro_upstream $dist_ours
 
 # Update the Sources files against new packages that have been downloaded.
 ./update-sources.py $QUIET
@@ -71,4 +73,4 @@
 ./expire-pool.py $QUIET
 
 # ?! untidy
-rm -rf /srv/patches.ubuntu.com/unpacked/*
+rm -rf $workingdir/unpacked/*

=== modified file 'deb/version.py'
--- deb/version.py	2010-05-17 12:48:51 +0000
+++ deb/version.py	2010-06-22 18:57:26 +0000
@@ -127,7 +127,7 @@
 
 
 def strcut(str, idx, accept):
-    """Cut characters from str that are entirely in accept."""
+    """Cut characters from string that are entirely in accept."""
     ret = ""
     while idx < len(str) and str[idx] in accept:
         ret += str[idx]

=== modified file 'expire-pool.py'
--- expire-pool.py	2009-05-29 07:14:15 +0000
+++ expire-pool.py	2010-06-22 18:57:26 +0000
@@ -31,14 +31,14 @@
 
     # Run through our default distribution and use that for the base
     # package names.  Expire from all distributions.
-    for component in DISTROS[OUR_DISTRO]["components"]:
-        for source in get_sources(OUR_DISTRO, OUR_DIST, component):
+    for component in config.get("downstream", "components").split():
+        for source in get_sources(config.get("downstream", "name"), config.get("downstream", "dist"), component):
             base = get_base(source)
             logging.debug("%s %s", source["Package"], source["Version"])
             logging.debug("base is %s", base)
 
             for distro in distros:
-                if DISTROS[distro]["expire"]:
+                if config.get(distro, "expire"):
                     expire_pool_sources(distro, source["Package"], base)
 
 
@@ -96,7 +96,7 @@
                 logging.debug("Not removing %s/%s", pooldir, name)
                 continue
 
-            tree.remove("%s/%s/%s" % (ROOT, pooldir, name))
+            tree.remove("%s/%s/%s" % (config.get("filesystem", "workingroot"), pooldir, name))
             logging.debug("Removed %s/%s", pooldir, name)
 
     update_pool_sources(distro, package)

=== modified file 'generate-diffs.py'
--- generate-diffs.py	2009-12-02 01:38:43 +0000
+++ generate-diffs.py	2010-06-22 18:57:26 +0000
@@ -43,8 +43,8 @@
     # For each package in the given distributions, iterate the pool in order
     # and generate a diff from the previous version and a changes file
     for distro in distros:
-        for dist in DISTROS[distro]["dists"]:
-            for component in DISTROS[distro]["components"]:
+        for dist in config.get(distro, "dists").split():
+            for component in config.get(distro, "components").split():
                 if options.component is not None \
                        and component not in options.component:
                     continue
@@ -80,10 +80,10 @@
         try:
             save_changes_file(changes_filename, this, last)
             logging.info("Saved changes file: %s",
-                          tree.subdir(ROOT, changes_filename))
+                          tree.subdir(config.get("filesystem", "workingroot"), changes_filename))
         except (ValueError, OSError):
             logging.error("dpkg-genchanges for %s failed",
-                          tree.subdir(ROOT, changes_filename))
+                          tree.subdir(config.get("filesystem", "workingroot"), changes_filename))
 
     if last is None:
         return
@@ -95,7 +95,7 @@
         unpack_source(last)
         save_patch_file(diff_filename, last, this)
         save_basis(diff_filename, last["Version"])
-        logging.info("Saved diff file: %s", tree.subdir(ROOT, diff_filename))
+        logging.info("Saved diff file: %s", tree.subdir(config.get("filesystem", "workingroot"), diff_filename))
 
 
 if __name__ == "__main__":

=== modified file 'generate-dpatches.py'
--- generate-dpatches.py	2009-12-02 01:38:43 +0000
+++ generate-dpatches.py	2010-06-22 18:57:26 +0000
@@ -43,8 +43,8 @@
     # For each package in the given distributions, iterate the pool in order
     # and extract patches from debian/patches
     for distro in distros:
-        for dist in DISTROS[distro]["dists"]:
-            for component in DISTROS[distro]["components"]:
+        for dist in config.get(distro, "dists").split():
+            for component in config.get(distro, "components").split():
                 if options.component is not None \
                        and component not in options.component:
                     continue
@@ -67,7 +67,7 @@
     logging.debug("%s: %s %s", distro, source["Package"], source["Version"])
 
     stamp = "%s/%s/dpatch-stamp-%s" \
-        % (ROOT, source["Directory"], source["Version"])
+        % (config.get("filesystem", "workingroot"), source["Directory"], source["Version"])
 
     if not os.path.isfile(stamp):
         open(stamp, "w").close()
@@ -76,7 +76,7 @@
         try:
             dirname = dpatch_directory(distro, source)
             extract_dpatches(dirname, source)
-            logging.info("Saved dpatches: %s", tree.subdir(ROOT, dirname))
+            logging.info("Saved dpatches: %s", tree.subdir(config.get("filesystem", "workingroot"), dirname))
         finally:
             cleanup_source(source)
 

=== modified file 'generate-patches.py'
--- generate-patches.py	2009-12-02 01:38:43 +0000
+++ generate-patches.py	2010-06-22 18:57:26 +0000
@@ -31,17 +31,17 @@
                       help="Force creation of patches")
 
     parser.add_option("-D", "--source-distro", type="string", metavar="DISTRO",
-                      default=SRC_DISTRO,
+                      default=config.get("upstream", "name"),
                       help="Source distribution")
     parser.add_option("-S", "--source-suite", type="string", metavar="SUITE",
-                      default=SRC_DIST,
+                      default=config.get("upstream", "dist"),
                       help="Source suite (aka distrorelease)")
 
     parser.add_option("-d", "--dest-distro", type="string", metavar="DISTRO",
-                      default=OUR_DISTRO,
+                      default=config.get("downstream", "name"),
                       help="Destination distribution")
     parser.add_option("-s", "--dest-suite", type="string", metavar="SUITE",
-                      default=OUR_DIST,
+                      default=config.get("downstream", "dist"),
                       help="Destination suite (aka distrorelease)")
 
     parser.add_option("-p", "--package", type="string", metavar="PACKAGE",
@@ -63,7 +63,7 @@
     # For each package in the destination distribution, locate the latest in
     # the source distribution; calculate the base from the destination and
     # create patches from that to both
-    for our_component in DISTROS[our_distro]["components"]:
+    for our_component in config.get("downstream", "components").split():
         if options.component is not None \
                and our_component not in options.component:
             continue
@@ -165,7 +165,7 @@
     ensure(filename)
     save_patch_file(filename, base_source, our_source)
     save_basis(filename, base_version)
-    logging.info("Saved patch file: %s", tree.subdir(ROOT, filename))
+    logging.info("Saved patch file: %s", tree.subdir(config.get("filesystem", "workingroot"), filename))
 
 
 if __name__ == "__main__":

=== modified file 'grab-merge.sh'
--- grab-merge.sh	2009-02-27 12:05:36 +0000
+++ grab-merge.sh	2010-06-22 18:57:26 +0000
@@ -16,6 +16,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+. config.sh
+
 # Uncomment if you have an account on casey
 #RSYNC=y
 
@@ -49,14 +51,14 @@
 
 if [ "$RSYNC" = "y" ]; then
     rsync --verbose --archive --progress --compress --delete \
-	casey.ubuntu.com:/srv/patches.ubuntu.com/merges/$HASH/$MERGE/ .
+	$rsync_remote:$workingdir/merges/$HASH/$MERGE/ .
 else
     rm -rf  *
-    wget -q https://merges.ubuntu.com/$HASH/$MERGE/REPORT
+    wget -q $publichost$HASH/$MERGE/REPORT
 
     for NAME in $(sed -n -e "/^    /p" REPORT); do
 	echo "Getting $NAME..."
-	[ -f $NAME ] || wget -q https://merges.ubuntu.com/$HASH/$MERGE/$NAME
+	[ -f $NAME ] || wget -q $publichost$HASH/$MERGE/$NAME
     done
 fi
 echo

=== modified file 'mail-bugs.py'
--- mail-bugs.py	2008-02-12 17:26:46 +0000
+++ mail-bugs.py	2010-06-22 18:57:26 +0000
@@ -34,21 +34,12 @@
 from deb.version import Version
 
 
-# Order of severities
-SEVERITY = [ "unknown", "critical", "grave", "serious", "important", "normal",
-             "minor", "wishlist" ]
-
-# Who to send to
-RECIPIENTS = [ "[e-mail]",
-               "[e-mail]" ]
-
-
 def options(parser):
     parser.add_option("-d", "--distro", type="string", metavar="DISTRO",
-                      default=SRC_DISTRO,
+                      default=config.get("upstream", "name"),
                       help="Distribution to mail bug closures for")
     parser.add_option("-s", "--suite", type="string", metavar="SUITE",
-                      default=SRC_DIST,
+                      default=config.get("upstream", "dist"),
                       help="Suite (aka distrorelease)")
 
 def main(options, args):
@@ -59,7 +50,7 @@
 
     # For each package in the distribution, iterate the pool and read each
     # changes file to obtain the list of closed bugs.
-    for component in DISTROS[distro]["components"]:
+    for component in config.get("upstream", "components").split():
         for source in get_sources(distro, dist, component):
             package = source["Package"]
 
@@ -142,9 +133,7 @@
         severity = "unknown"
 
     logging.debug("Severity: %s", severity)
-    if severity in SEVERITY:
-        severity = SEVERITY.index(severity)
-    else:
+    if not severity in config.get("misc", "severity"):
         severity = 0
 
     return (severity, package, bug, title)
@@ -163,7 +152,7 @@
         if len(str(bug)) > max_bug:
             max_bug = len(str(bug))
 
-    for idx, severity in enumerate(SEVERITY):
+    for idx, severity in enumerate(config.get("misc", "severity")):
         closures = [ bug for bug in bugs if bug[0] == idx ]
         if not len(closures):
             continue
@@ -178,13 +167,13 @@
         text += "\n"
 
     message = MIMEText(text)
-    message.add_header("From", "Ubuntu Merge-o-Matic <[e-mail]>")
-    message.add_header("To", "Ubuntu Merge-o-Matic <[e-mail]>")
+    message.add_header("From", config.get("email", "fromheader"))
+    message.add_header("To", config.get("email", "toheader"))
     message.add_header("Date", formatdate())
-    message.add_header("Subject", "Bugs closed in Debian")
+    message.add_header("Subject", config.get("email", "subject"))
     message.add_header("Message-ID", make_msgid())
 
-    send_message(message, RECIPIENTS)
+    send_message(message, config.get("email", "recipients"))
 
 def send_message(message, recipients):
     """Send out a message to everyone subscribed to it."""
@@ -194,7 +183,7 @@
         logging.debug("Sending to %s", addr)
         message.replace_header("To", addr)
 
-        smtp.sendmail("[e-mail]", addr , message.as_string())
+        smtp.sendmail(config.get("email", "smtphost"), addr , message.as_string())
 
     smtp.quit()
 
@@ -202,7 +191,7 @@
 def read_watermark(distro, package):
     """Read the watermark for a given package."""
     mark_file = "%s/%s/bugs-watermark" \
-                % (ROOT, pool_directory(distro, package))
+                % (config.get("filesystem", "workingroot"), pool_directory(distro, package))
     if not os.path.isfile(mark_file):
         return Version("0")
 
@@ -215,7 +204,7 @@
 def save_watermark(distro, package, version):
     """Save the watermark for a given packagesource."""
     mark_file = "%s/%s/bugs-watermark" \
-                % (ROOT, pool_directory(distro, package))
+                % (config.get("filesystem", "workingroot"), pool_directory(distro, package))
     mark = open(mark_file, "w")
     try:
         print >>mark, "%s" % version

=== modified file 'manual-status.py'
--- manual-status.py	2009-03-02 15:33:48 +0000
+++ manual-status.py	2010-06-22 18:57:26 +0000
@@ -25,28 +25,19 @@
 from momlib import *
 
 
-# Order of priorities
-PRIORITY = [ "unknown", "required", "important", "standard", "optional",
-             "extra" ]
-COLOURS =  [ "#ff8080", "#ffb580", "#ffea80", "#dfff80", "#abff80", "#80ff8b" ]
-
-# Sections
-SECTIONS = [ "new", "updated" ]
-
-
 def options(parser):
     parser.add_option("-D", "--source-distro", type="string", metavar="DISTRO",
-                      default=SRC_DISTRO,
+                      default=config.get("upstream", "name"),
                       help="Source distribution")
     parser.add_option("-S", "--source-suite", type="string", metavar="SUITE",
-                      default=SRC_DIST,
+                      default=config.get("upstream", "dist"),
                       help="Source suite (aka distrorelease)")
 
     parser.add_option("-d", "--dest-distro", type="string", metavar="DISTRO",
-                      default=OUR_DISTRO,
+                      default=config.get("downstream", "name"),
                       help="Destination distribution")
     parser.add_option("-s", "--dest-suite", type="string", metavar="SUITE",
-                      default=OUR_DIST,
+                      default=config.get("downstream", "dist"),
                       help="Destination suite (aka distrorelease)")
 
     parser.add_option("-c", "--component", type="string", metavar="COMPONENT",
@@ -62,7 +53,7 @@
 
     # For each package in the destination distribution, find out whether
     # there's an open merge, and if so add an entry to the table for it.
-    for our_component in DISTROS[our_distro]["components"]:
+    for our_component in config.get("downstream", "components").split():
         if options.component is not None \
                and our_component not in options.component:
             continue
@@ -114,7 +105,7 @@
                                    multi_para=False, signed=False).para
 
                 user = info["Changed-By"]
-                uploaded = info["Distribution"] == OUR_DIST
+                uploaded = info["Distribution"] == config.get("downstream", "dist")
             else:
                 user = None
                 uploaded = False
@@ -131,7 +122,7 @@
 
         write_status_page(our_component, merges, our_distro, src_distro)
 
-        status_file = "%s/merges/tomerge-%s-manual" % (ROOT, our_component)
+        status_file = "%s/merges/tomerge-%s-manual" % (config.get("filesystem", "workingroot"), our_component)
         remove_old_comments(status_file, merges)
         write_status_file(status_file, merges)
 
@@ -140,7 +131,7 @@
     """Write out the manual merge status page."""
     merges.sort()
 
-    status_file = "%s/merges/%s-manual.html" % (ROOT, component)
+    status_file = "%s/merges/%s-manual.html" % (config.get("filesystem", "workingroot"), component)
     status = open(status_file + ".new", "w")
     try:
         print >>status, "<html>"
@@ -214,7 +205,7 @@
         return None
 
     filename = "%s/pool/%s/%s/%s/%s" \
-            % (ROOT, distro, pathhash(source["Package"]), source["Package"], 
+            % (config.get("filesystem", "workingroot"), distro, pathhash(source["Package"]), source["Package"], 
                dsc_file)
 
     (a, b, c) = os.popen3("gpg --verify %s" % filename)

=== modified file 'merge-status.py'
--- merge-status.py	2010-03-03 07:30:07 +0000
+++ merge-status.py	2010-06-22 18:57:26 +0000
@@ -27,28 +27,23 @@
 from momlib import *
 
 
-# Order of priorities
-PRIORITY = [ "unknown", "required", "important", "standard", "optional",
-             "extra" ]
-COLOURS =  [ "#ff8080", "#ffb580", "#ffea80", "#dfff80", "#abff80", "#80ff8b" ]
-
 # Sections
 SECTIONS = [ "outstanding", "new", "updated" ]
 
 
 def options(parser):
     parser.add_option("-D", "--source-distro", type="string", metavar="DISTRO",
-                      default=SRC_DISTRO,
+                      default=config.get("upstream", "name"),
                       help="Source distribution")
     parser.add_option("-S", "--source-suite", type="string", metavar="SUITE",
-                      default=SRC_DIST,
+                      default=config.get("upstream", "dist"),
                       help="Source suite (aka distrorelease)")
 
     parser.add_option("-d", "--dest-distro", type="string", metavar="DISTRO",
-                      default=OUR_DISTRO,
+                      default=config.get("downstream", "name"),
                       help="Destination distribution")
     parser.add_option("-s", "--dest-suite", type="string", metavar="SUITE",
-                      default=OUR_DIST,
+                      default=config.get("downstream", "dist"),
                       help="Destination suite (aka distrorelease)")
 
     parser.add_option("-c", "--component", type="string", metavar="COMPONENT",
@@ -63,10 +58,10 @@
     our_dist = options.dest_suite
 
     outstanding = []
-    if os.path.isfile("%s/outstanding-merges.txt" % ROOT):
+    if os.path.isfile("%s/outstanding-merges.txt" % config.get("filesystem", "workingroot")):
         after_uvf = True
 
-        f = open("%s/outstanding-merges.txt" % ROOT)
+        f = open("%s/outstanding-merges.txt" % config.get("filesystem", "workingroot"))
         try:
             for line in f:
                 outstanding.append(line.strip())
@@ -78,7 +73,7 @@
 
     # For each package in the destination distribution, find out whether
     # there's an open merge, and if so add an entry to the table for it.
-    for our_component in DISTROS[our_distro]["components"]:
+    for our_component in config.get("downstream", "components").split():
         if options.component is not None \
                and our_component not in options.component:
             continue
@@ -116,7 +111,7 @@
                 except KeyError:
                     user = None
                 try:
-                    uploaded = info["Distribution"] == OUR_DIST
+                    uploaded = info["Distribution"] == config.get("downstream", "dist")
                 except KeyError:
                     uploaded = False
             else:
@@ -142,7 +137,7 @@
 
         write_status_page(our_component, merges, our_distro, src_distro)
 
-        status_file = "%s/merges/tomerge-%s" % (ROOT, our_component)
+        status_file = "%s/merges/tomerge-%s" % (config.get("filesystem", "workingroot"), our_component)
         remove_old_comments(status_file, merges)
         write_status_file(status_file, merges)
 
@@ -157,7 +152,7 @@
         return None
 
     filename = "%s/pool/%s/%s/%s/%s" \
-            % (ROOT, distro, pathhash(source["Package"]), source["Package"], 
+            % (config.get("filesystem", "workingroot"), distro, pathhash(source["Package"]), source["Package"], 
                dsc_file)
 
     (a, b, c) = os.popen3("gpg --verify %s" % filename)
@@ -170,7 +165,7 @@
 
 def write_status_page(component, merges, left_distro, right_distro):
     """Write out the merge status page."""
-    status_file = "%s/merges/%s.html" % (ROOT, component)
+    status_file = "%s/merges/%s.html" % (config.get("filesystem", "workingroot"), component)
     status = open(status_file + ".new", "w")
     try:
         print >>status, "<html>"

=== added file 'mom.conf'
--- mom.conf	1970-01-01 00:00:00 +0000
+++ mom.conf	2010-06-22 18:57:26 +0000
@@ -0,0 +1,41 @@
+[filesystem]
+workingroot: /srv/patches.ubuntu.com
+
+# Distribution definitions
+[upstream]
+name: debian
+mirror: http://ftp.uk.debian.org/debian
+dist: unstable
+dists: unstable testing testing-proposed-updates experimental
+components: main contrib non-free
+expire: True
+
+[downstream]
+name: ubuntu
+mirror: http://archive.ubuntu.com/ubuntu
+dist: maverick
+dists: maverick
+components: main restricted universe multiverse
+expire: True
+
+[email]
+# Who to send to
+recipients: [e-mail] [e-mail]
+fromheader: "Ubuntu Merge-o-Matic <[e-mail]>"
+toheader: "Ubuntu Merge-o-Matic <[e-mail]>"
+subject: "Bugs closed in Debian"
+smtphost: [e-mail]
+
+[misc]
+# Time format for RSS feeds
+rss_time_format: "%a, %d %b %Y %H:%M:%S %Z"
+
+severity: unknown critical grave serious important normal minor wishlist
+
+priority: unknown required important standard optional extra
+
+sections: new updated
+
+colours: #ff8080 #ffb580 #ffea80 #dfff80 #abff80 #80ff8b
+
+

=== modified file 'momlib.py'
--- momlib.py	2010-05-17 12:48:51 +0000
+++ momlib.py	2010-06-22 18:57:26 +0000
@@ -34,12 +34,14 @@
 from deb.controlfile import ControlFile
 from deb.version import Version
 from util import shell, tree
+from ConfigParser import ConfigParser
 
 try:
     from xml.etree import ElementTree
 except ImportError:
     from elementtree import ElementTree
 
+<<<<<<< TREE
 
 # Output root
 ROOT = "/srv/patches.ubuntu.com"
@@ -96,6 +98,66 @@
 # Time format for RSS feeds
 RSS_TIME_FORMAT = "%a, %d %b %Y %H:%M:%S %Z"
 
+=======
+# Setup our config reading
+config = ConfigParser()
+momConfigFile = 'mom.conf'
+config.read(momConfigFile)
+
+# Check whether the config file has everything necessary for merge-o-matic
+if not config.has_section("filesystem"):
+    print momConfigFile + ' is missing section [filesystem]'
+else:
+    if not config.has_option("filesystem", "workingroot"):
+        print momConfigFile + ' is missing option "workingroot" in section [filesystem]'
+        sys.exit()
+
+if not config.has_section("upstream"):
+    print momConfigFile + ' is missing section [upstream]'
+    sys.exit()
+else:
+    if not config.has_option("upstream", "name"):
+        print momConfigFile + ' is missing option "name" in section [upstream]'
+        sys.exit()
+    if not config.has_option("upstream", "mirror"):
+        print momConfigFile + ' is missing option "mirror" in section [upstream]'
+        sys.exit()
+    if not config.has_option("upstream", "dist"):
+        print momConfigFile + ' is missing option "dist" in section [upstream]'
+        sys.exit()
+    if not config.has_option("upstream", "dists"):
+        print momConfigFile + ' is missing option "dists" in section [upstream]'
+        sys.exit()
+    if not config.has_option("upstream", "components"):
+        print momConfigFile + ' is missing option "components" in section [upstream]'
+        sys.exit()
+    if not config.has_option("upstream", "expire"):
+        print momConfigFile + ' is missing option "expire" in section [upstream]'
+        sys.exit()
+
+if not config.has_section("downstream"):
+    print momConfigFile + ' is missing section [downstream]'
+    sys.exit()
+else:
+    if not config.has_option("downstream", "name"):
+        print momConfigFile + ' is missing option "name" in section [downstream]'
+        sys.exit()
+    if not config.has_option("downstream", "mirror"):
+        print momConfigFile + ' is missing option "mirror" in section [downstream]'
+        sys.exit()
+    if not config.has_option("downstream", "dist"):
+        print momConfigFile + ' is missing option "dist" in section [downstream]'
+        sys.exit()
+    if not config.has_option("downstream", "dists"):
+        print momConfigFile + ' is missing option "dists" in section [downstream]'
+        sys.exit()
+    if not config.has_option("downstream", "components"):
+        print momConfigFile + ' is missing option "components" in section [downstream]'
+        sys.exit()
+    if not config.has_option("downstream", "expire"):
+        print momConfigFile + ' is missing option "expire" in section [downstream]'
+        sys.exit()
+>>>>>>> MERGE-SOURCE
 
 # Cache of parsed sources files
 SOURCES_CACHE = {}
@@ -131,6 +193,7 @@
     """Ensure that the parent directories for path exist."""
     dirname = os.path.dirname(path)
     if not os.path.isdir(dirname):
+<<<<<<< TREE
         try:
             os.makedirs(dirname)
         except IOError, e:
@@ -139,6 +202,16 @@
             print e
         finally:
             exit(1)
+=======
+        try:
+            os.makedirs(dirname)
+        except OSError, e:
+            print e
+            exit(1)
+        except IOError, e:
+            print e
+            exit(1)
+>>>>>>> MERGE-SOURCE
 
 def pathhash(path):
     """Return the path hash component for path."""
@@ -148,11 +221,11 @@
         return path[:1]
 
 def cleanup(path):
-    """Remove the path and any empty directories up to ROOT."""
+    """Remove the path and any empty directories up to workingroot."""
     tree.remove(path)
 
     (dirname, basename) = os.path.split(path)
-    while dirname != ROOT:
+    while dirname != config.get("filesystem", "workingroot"):
         try:
             os.rmdir(dirname)
         except OSError, e:
@@ -173,7 +246,7 @@
 
 def sources_file(distro, dist, component):
     """Return the location of a local Sources file."""
-    return "%s/dists/%s-%s/%s/source/Sources.gz" % (ROOT, distro, dist,
+    return "%s/dists/%s-%s/%s/source/Sources.gz" % (config.get("filesystem", "workingroot"), distro, dist,
 						    component)
 
 def pool_directory(distro, package):
@@ -183,29 +256,29 @@
 def pool_sources_file(distro, package):
     """Return the location of a pool Sources file for a source."""
     pooldir = pool_directory(distro, package)
-    return "%s/%s/Sources" % (ROOT, pooldir)
+    return "%s/%s/Sources" % (config.get("filesystem", "workingroot"), pooldir)
 
 def unpack_directory(source):
     """Return the location of a local unpacked source."""
-    return "%s/unpacked/%s/%s/%s" % (ROOT, pathhash(source["Package"]),
+    return "%s/unpacked/%s/%s/%s" % (config.get("filesystem", "workingroot"), pathhash(source["Package"]),
                                      source["Package"], source["Version"])
 
 def changes_file(distro, source):
     """Return the location of a local changes file."""
     return "%s/changes/%s/%s/%s/%s_%s_source.changes" \
-           % (ROOT, distro, pathhash(source["Package"]),
+           % (config.get("filesystem", "workingroot"), distro, pathhash(source["Package"]),
               source["Package"], source["Package"], source["Version"])
 
 def dpatch_directory(distro, source):
     """Return the directory where we put dpatches."""
     return "%s/dpatches/%s/%s/%s/%s" \
-           % (ROOT, distro, pathhash(source["Package"]), source["Package"],
+           % (config.get("filesystem", "workingroot"), distro, pathhash(source["Package"]), source["Package"],
               source["Version"])
 
 def diff_directory(distro, source):
     """Return the directory where we can find diffs."""
     return "%s/diffs/%s/%s/%s" \
-           % (ROOT, distro, pathhash(source["Package"]), source["Package"])
+           % (config.get("filesystem", "workingroot"), distro, pathhash(source["Package"]), source["Package"])
 
 def diff_file(distro, source):
     """Return the location of a local diff file."""
@@ -215,7 +288,7 @@
 def patch_directory(distro, source):
     """Return the directory where we can find local patch files."""
     return "%s/patches/%s/%s/%s" \
-           % (ROOT, distro, pathhash(source["Package"]), source["Package"])
+           % (config.get("filesystem", "workingroot"), distro, pathhash(source["Package"]), source["Package"])
 
 def patch_file(distro, source, slipped=False):
     """Return the location of a local patch file."""
@@ -229,34 +302,34 @@
 def published_file(distro, source):
     """Return the location where published patches should be placed."""
     return "%s/published/%s/%s/%s_%s.patch" \
-           % (ROOT, pathhash(source["Package"]), source["Package"],
+           % (config.get("filesystem", "workingroot"), pathhash(source["Package"]), source["Package"],
               source["Package"], source["Version"])
 
 def patch_list_file():
     """Return the location of the patch list."""
-    return "%s/published/PATCHES" % ROOT
+    return "%s/published/PATCHES" % config.get("filesystem", "workingroot")
 
 def patch_rss_file(distro=None, source=None):
     """Return the location of the patch rss feed."""
     if distro is None or source is None:
-        return "%s/published/patches.xml" % ROOT
+        return "%s/published/patches.xml" % config.get("filesystem", "workingroot")
     else:
         return "%s/patches.xml" % patch_directory(distro, source)
 
 def diff_rss_file(distro=None, source=None):
     """Return the location of the diff rss feed."""
     if distro is None or source is None:
-        return "%s/diffs/patches.xml" % ROOT
+        return "%s/diffs/patches.xml" % config.get("filesystem", "workingroot")
     else:
         return "%s/patches.xml" % diff_directory(distro, source)
 
 def work_dir(package, version):
     """Return the directory to produce the merge result."""
-    return "%s/work/%s/%s/%s" % (ROOT, pathhash(package), package, version)
+    return "%s/work/%s/%s/%s" % (config.get("filesystem", "workingroot"), pathhash(package), package, version)
 
 def result_dir(package):
     """Return the directory to store the result in."""
-    return "%s/merges/%s/%s" % (ROOT, pathhash(package), package)
+    return "%s/merges/%s/%s" % (config.get("filesystem", "workingroot"), pathhash(package), package)
 
 
 # --------------------------------------------------------------------------- #
@@ -290,19 +363,17 @@
 
 def pool_name(distro):
     """Return the name of the pool for the given distro."""
-    if "pool" in DISTROS[distro]:
-        return DISTROS[distro]["pool"]
-    else:
-        return distro
+    if distro == "pool":
+        return config.get(distro, "pool")
+    return distro
 
 def get_pool_distros():
     """Return the list of distros with pools."""
     distros = []
-    for distro in DISTROS.keys():
+    for distro in ("upstream", "downstream"):
         pool = pool_name(distro)
         if pool not in distros:
             distros.append(pool)
-
     return distros
 
 def update_pool_sources(distro, package):
@@ -310,10 +381,10 @@
     pooldir = pool_directory(distro, package)
     filename = pool_sources_file(distro, package)
 
-    logging.info("Updating %s", tree.subdir(ROOT, filename))
+    logging.info("Updating %s", tree.subdir(config.get("filesystem", "workingroot"), filename))
     sources = open(filename, "w")
     try:
-        shell.run(("apt-ftparchive", "sources", pooldir), chdir=ROOT,
+        shell.run(("apt-ftparchive", "sources", pooldir), chdir=config.get("filesystem", "workingroot"),
                   stdout=sources)
     finally:
         sources.close()
@@ -340,7 +411,7 @@
 def get_nearest_source(package, base):
     """Return the base source or nearest to it."""
     try:
-        sources = get_pool_sources(SRC_DISTRO, package)
+        sources = get_pool_sources(config.get("upstream", "name"), package)
     except IOError:
         sources = []
 
@@ -352,14 +423,14 @@
             bases.append(source)
     else:
         try:
-            return get_pool_source(OUR_DISTRO, package, base)
+            return get_pool_source(config.get("downstream", "name"), package, base)
         except (IOError, IndexError):
             version_sort(bases)
             return bases.pop()
 
 def get_same_source(distro, dist, package):
     """Find the same source in another distribution."""
-    for component in DISTROS[distro]["components"]:
+    for component in config.get(distro, "components").split():
         try:
             source = get_source(distro, dist, component, package)
             version = Version(source["Version"])
@@ -443,7 +514,7 @@
     if os.path.isdir(destdir):
         return destdir
 
-    srcdir = "%s/%s" % (ROOT, source["Directory"])
+    srcdir = "%s/%s" % (config.get("filesystem", "workingroot"), source["Directory"])
     for md5sum, size, name in files(source):
         if name.endswith(".dsc"):
             dsc_file = name
@@ -476,7 +547,7 @@
     """Save a changes file for the given source."""
     srcdir = unpack_directory(source)
 
-    filesdir = "%s/%s" % (ROOT, source["Directory"])
+    filesdir = "%s/%s" % (config.get("filesystem", "workingroot"), source["Directory"])
 
     ensure(filename)
     changes = open(filename, "w")
@@ -552,7 +623,7 @@
 
 def read_blacklist():
     """Read the blacklist file."""
-    filename = "%s/sync-blacklist.txt" % ROOT
+    filename = "%s/sync-blacklist.txt" % config.get("filesystem", "workingroot")
     if not os.path.isfile(filename):
         return []
 
@@ -661,7 +732,7 @@
 
 def comments_file():
     """Return the location of the comments."""
-    return "%s/comments.txt" % ROOT
+    return "%s/comments.txt" % config.get("filesystem", "workingroot")
 
 def get_comments():
     """Extract the comments from file, and return a dictionary

=== modified file 'pack-archive.sh'
--- pack-archive.sh	2008-04-28 19:05:17 +0000
+++ pack-archive.sh	2010-06-22 18:57:26 +0000
@@ -3,7 +3,9 @@
 set -e
 umask 002
 
-cd /srv/patches.ubuntu.com
+. config.sh
+
+cd $workingdir
 
 find changes -name "*.changes" -mtime +182 -print0 | xargs -0r bzip2
 find diffs -name "*.patch" -mtime +182 -print0 | xargs -0r bzip2

=== modified file 'produce-merges.py'
--- produce-merges.py	2010-01-26 13:49:00 +0000
+++ produce-merges.py	2010-06-22 18:57:26 +0000
@@ -42,17 +42,17 @@
                       help="Force creation of merges")
 
     parser.add_option("-D", "--source-distro", type="string", metavar="DISTRO",
-                      default=SRC_DISTRO,
+                      default=config.get("upstream", "name"),
                       help="Source distribution")
     parser.add_option("-S", "--source-suite", type="string", metavar="SUITE",
-                      default=SRC_DIST,
+                      default=config.get("upstream", "dist"),
                       help="Source suite (aka distrorelease)")
 
     parser.add_option("-d", "--dest-distro", type="string", metavar="DISTRO",
-                      default=OUR_DISTRO,
+                      default=config.get("downstream", "name"),
                       help="Destination distribution")
     parser.add_option("-s", "--dest-suite", type="string", metavar="SUITE",
-                      default=OUR_DIST,
+                      default=config.get("downstream", "dist"),
                       help="Destination suite (aka distrorelease)")
 
     parser.add_option("-p", "--package", type="string", metavar="PACKAGE",
@@ -93,7 +93,7 @@
     # For each package in the destination distribution, locate the latest in
     # the source distribution; calculate the base from the destination and
     # produce a merge combining both sets of changes
-    for our_component in DISTROS[our_distro]["components"]:
+    for our_component in config.get("downstream", "components").split():
         if options.component is not None \
                and our_component not in options.component:
             continue
@@ -228,7 +228,7 @@
 def do_merge(left_dir, left_name, left_distro, base_dir,
              right_dir, right_name, right_distro, merged_dir):
     """Do the heavy lifting of comparing and merging."""
-    logging.debug("Producing merge in %s", tree.subdir(ROOT, merged_dir))
+    logging.debug("Producing merge in %s", tree.subdir(config.get("filesystem", "workingroot"), merged_dir))
     conflicts = []
     po_files = []
 
@@ -719,7 +719,7 @@
 def copy_in(output_dir, source, distro=None):
     """Make a copy of the source files."""
     for md5sum, size, name in files(source):
-        src = "%s/%s/%s" % (ROOT, source["Directory"], name)
+        src = "%s/%s/%s" % (config.get("filesystem", "workingroot"), source["Directory"], name)
         dest = "%s/%s" % (output_dir, name)
         if os.path.isfile(dest):
             os.unlink(dest)
@@ -754,7 +754,7 @@
 
         shell.run(("tar", "czf", filename, contained), chdir=parent)
 
-        logging.info("Created %s", tree.subdir(ROOT, filename))
+        logging.info("Created %s", tree.subdir(config.get("filesystem", "workingroot"), filename))
         return os.path.basename(filename)
     finally:
         tree.remove(parent)
@@ -794,7 +794,7 @@
 
             return os.path.basename(filename)
         else:
-            logging.warning("Dropped dsc %s", tree.subdir(ROOT, filename))
+            logging.warning("Dropped dsc %s", tree.subdir(config.get("filesystem", "workingroot"), filename))
             return create_tarball(package, version, output_dir, merged_dir)
     finally:
         tree.remove(parent)
@@ -814,7 +814,7 @@
             shell.run(("diff", "-pruN",
                        right_source["Version"], "%s" % version),
                       chdir=parent, stdout=diff, okstatus=(0, 1, 2))
-            logging.info("Created %s", tree.subdir(ROOT, filename))
+            logging.info("Created %s", tree.subdir(config.get("filesystem", "workingroot"), filename))
         finally:
             diff.close()
 

=== modified file 'publish-patches.py'
--- publish-patches.py	2010-02-26 09:48:57 +0000
+++ publish-patches.py	2010-06-22 18:57:26 +0000
@@ -26,10 +26,10 @@
 
 def options(parser):
     parser.add_option("-d", "--distro", type="string", metavar="DISTRO",
-                      default=OUR_DISTRO,
+                      default=config.get("downstream", "name"),
                       help="Distribution to publish")
     parser.add_option("-s", "--suite", type="string", metavar="SUITE",
-                      default=OUR_DIST,
+                      default=config.get("downstream", "dist"),
                       help="Suite (aka distrorelease) to publish")
 
 def main(options, args):
@@ -48,8 +48,8 @@
     try:
         # For each package in the distribution, check for a patch for the
         # current version; publish if it exists, clean up if not
-        for component in DISTROS[distro]["components"]:
-            for source in get_sources(distro, dist, component):
+        for component in config.get(distro, "components").split():
+            for source in get_sources(distro, dist, component).split():
                 package = source["Package"]
 
                 if package in blacklist:
@@ -81,9 +81,9 @@
         os.unlink(publish_filename)
     os.link(filename, publish_filename)
 
-    logging.info("Published %s", tree.subdir(ROOT, publish_filename))
+    logging.info("Published %s", tree.subdir(config.get("filesystem", "workingroot"), publish_filename))
     print >>list_file, "%s %s" % (source["Package"],
-                                  tree.subdir("%s/published" % ROOT,
+                                  tree.subdir("%s/published" % config.get("filesystem", "workingroot"),
                                               publish_filename))
 
     # Remove older patches
@@ -107,7 +107,7 @@
             src_filename = "%s/%s" % (dpatch_dir, dpatch)
             dest_filename = "%s/%s" % (output, dpatch)
 
-            logging.info("Published %s", tree.subdir(ROOT, dest_filename))
+            logging.info("Published %s", tree.subdir(config.get("filesystem", "workingroot"), dest_filename))
             ensure(dest_filename)
             tree.copyfile(src_filename, dest_filename)
 

=== modified file 'stats-graphs.py'
--- stats-graphs.py	2010-02-26 09:50:21 +0000
+++ stats-graphs.py	2010-06-22 18:57:26 +0000
@@ -64,7 +64,7 @@
 
 def options(parser):
     parser.add_option("-d", "--distro", type="string", metavar="DISTRO",
-                      default=OUR_DISTRO,
+                      default=config.get("downstream", "name"),
                       help="Distribution to generate stats for")
 
 def main(options, args):
@@ -84,7 +84,7 @@
 
     # Iterate the components and calculate the peaks over the last six
     # months, as well as the current stats
-    for component in DISTROS[distro]["components"]:
+    for component in config.get(distro, "components").split():
         # Extract current and historical stats for this component
         current = get_current(stats[component])
         history = get_history(stats[component], start)
@@ -127,12 +127,21 @@
     """Read the stats history file."""
     stats = {}
 
+<<<<<<< TREE
     stats_file = "%s/stats.txt" % ROOT
     try:
         stf = open(stats_file, "r");
     except IOError, e:
         print e
         exit(1)
+=======
+    stats_file = "%s/stats.txt" % config.get("filesystem", "workingroot")
+    try:
+        stf = open(stats_file, "r");
+    except IOError, e:
+        print e
+        exit(1)
+>>>>>>> MERGE-SOURCE
     try:
         for line in stf:
             (date, time, component, info) = line.strip().split(" ", 3)
@@ -214,7 +223,7 @@
     data = zip([ LABELS[key] for key in ORDER ],
                info_to_data(None, current))
 
-    filename = "%s/merges/%s-now.png" % (ROOT, component)
+    filename = "%s/merges/%s-now.png" % (config.get("filesystem", "workingroot"), component)
     c = canvas.init(filename, format="png")
     try:
         ar = area.T(size=(300,250), legend=None,
@@ -246,7 +255,7 @@
     (y_tic_interval, y_minor_tic_interval) = \
                      sources_intervals(max(d[-1] for d in data))
 
-    filename = "%s/merges/%s-trend.png" % (ROOT, component)
+    filename = "%s/merges/%s-trend.png" % (config.get("filesystem", "workingroot"), component)
     c = canvas.init(filename, format="png")
     try:
         ar = area.T(size=(450,225), legend=legend.T(),

=== modified file 'stats.py'
--- stats.py	2008-01-10 13:19:44 +0000
+++ stats.py	2010-06-22 18:57:26 +0000
@@ -27,17 +27,17 @@
 
 def options(parser):
     parser.add_option("-D", "--source-distro", type="string", metavar="DISTRO",
-                      default=SRC_DISTRO,
+                      default="upstream",
                       help="Source distribution")
     parser.add_option("-S", "--source-suite", type="string", metavar="SUITE",
-                      default=SRC_DIST,
+                      default=config.get("upstream", "dist"),
                       help="Source suite (aka distrorelease)")
 
     parser.add_option("-d", "--dest-distro", type="string", metavar="DISTRO",
-                      default=OUR_DISTRO,
+                      default="downstream",
                       help="Destination distribution")
     parser.add_option("-s", "--dest-suite", type="string", metavar="SUITE",
-                      default=OUR_DIST,
+                      default=config.get("downstream", "dist"),
                       help="Destination suite (aka distrorelease)")
 
     parser.add_option("-p", "--package", type="string", metavar="PACKAGE",
@@ -58,7 +58,7 @@
 
     # For each package in the destination distribution, locate the latest in
     # the source distribution; calculate the base from the destination
-    for our_component in DISTROS[our_distro]["components"]:
+    for our_component in config.get(our_distro, "components").split():
         stats = {}
         stats["total"] = 0
         stats["local"] = 0
@@ -122,7 +122,7 @@
 
 def write_stats(component, stats):
     """Write out the collected stats."""
-    stats_file = "%s/stats.txt" % ROOT
+    stats_file = "%s/stats.txt" % config.get("filesystem", "workingroot")
     stf = open(stats_file, "a");
     try:
         stamp = time.strftime("%Y-%m-%d %H:%M", time.gmtime())

=== modified file 'syndicate.py'
--- syndicate.py	2010-02-26 09:52:33 +0000
+++ syndicate.py	2010-06-22 18:57:26 +0000
@@ -69,8 +69,8 @@
     # For each package in the given distributions, iterate the pool in order
     # and select various interesting files for syndication
     for distro in distros:
-        for dist in DISTROS[distro]["dists"]:
-            for component in DISTROS[distro]["components"]:
+        for dist in config.get(distro, "dists").split:
+            for component in config.get(distro, "components").split:
                 if options.component is not None \
                        and component not in options.component:
                     continue
@@ -87,7 +87,7 @@
                     this_patch_rss = read_rss(patch_rss_file(distro, source),
                                              title="Ubuntu Patches from Debian for %s" % source["Package"],
                                              link=("http://patches.ubuntu.com/by-release/" +
-                                                   tree.subdir("%s/patches" % ROOT,
+                                                   tree.subdir("%s/patches" % config.get("filesystem", "workingroot"),
                                                                patch_directory(distro, source))),
                                               description="This feed announces new patches from "
                                               "Ubuntu to Debian for %s, each patch filename contains "
@@ -96,7 +96,7 @@
                     this_diff_rss = read_rss(diff_rss_file(distro, source),
                                              title="Ubuntu Uploads for %s" % source["Package"],
                                              link=("http://patches.ubuntu.com/by-release/atomic/" +
-                                                   tree.subdir("%s/diffs" % ROOT,
+                                                   tree.subdir("%s/diffs" % config.get("filesystem", "workingroot"),
                                                                diff_directory(distro, source))),
                                              description="This feed announces new changes in "
                                              "Ubuntu for %s, each patch filename contains the "
@@ -160,14 +160,14 @@
     if not len(recipients):
         return
 
-    if distro == SRC_DISTRO:
+    if distro == config.get("upstream", "name"):
         # Debian uploads always just have a diff
         subject = "Debian %s %s" % (this["Package"], this["Version"])
         intro = MIMEText("""\
 This e-mail has been sent due to an upload to Debian, and contains the
 difference between the new version and the previous one.""")
         payload = diff_part(distro, this)
-    elif distro != OUR_DISTRO:
+    elif distro != config.get("downstream", "name"):
         # Other uploads always just have a diff
         subject = "%s %s %s" % (distro, this["Package"], this["Version"])
         intro = MIMEText("""\
@@ -333,14 +333,14 @@
         append_rss(patch_rss,
                    title=os.path.basename(patch_filename),
                    link=("http://patches.ubuntu.com/by-release/" +
-                         tree.subdir("%s/patches" % ROOT, patch_filename)),
+                         tree.subdir("%s/patches" % config.get("filesystem", "workingroot"), patch_filename)),
                    author=uploader,
                    filename=patch_filename)
 
         append_rss(this_patch_rss,
                    title=os.path.basename(patch_filename),
                    link=("http://patches.ubuntu.com/by-release/" +
-                         tree.subdir("%s/patches" % ROOT, patch_filename)),
+                         tree.subdir("%s/patches" % config.get("filesystem", "workingroot"), patch_filename)),
                    author=uploader,
                    filename=patch_filename)
 
@@ -356,14 +356,14 @@
         append_rss(diff_rss,
                    title=os.path.basename(diff_filename),
                    link=("http://patches.ubuntu.com/by-release/atomic/" +
-                         tree.subdir("%s/diffs" % ROOT, diff_filename)),
+                         tree.subdir("%s/diffs" % config.get("filesystem", "workingroot"), diff_filename)),
                    author=uploader,
                    filename=diff_filename)
 
         append_rss(this_diff_rss,
                    title=os.path.basename(diff_filename),
                    link=("http://patches.ubuntu.com/by-release/atomic/" +
-                         tree.subdir("%s/diffs" % ROOT, diff_filename)),
+                         tree.subdir("%s/diffs" % config.get("filesystem", "workingroot"), diff_filename)),
                    author=uploader,
                    filename=diff_filename)
 
@@ -372,12 +372,21 @@
     """Read the subscriptions file."""
     subscriptions = []
 
+<<<<<<< TREE
     try:
         f = open("%s/subscriptions.txt" % ROOT)
     except IOError, e:
         print e
         exit(1)
 
+=======
+    try:
+        f = open("%s/subscriptions.txt" % config.get("filesystem", "workingroot"))
+    except IOError, e:
+        print e
+        exit(1)
+
+>>>>>>> MERGE-SOURCE
     try:
         fcntl.flock(f.fileno(), fcntl.LOCK_SH)
 
@@ -395,7 +404,7 @@
 def read_watermark(distro, source):
     """Read the watermark for a given source."""
     mark_file = "%s/%s/watermark" \
-                % (ROOT, pool_directory(distro, source["Package"]))
+                % (config.get("filesystem", "workingroot"), pool_directory(distro, source["Package"]))
     if not os.path.isfile(mark_file):
         return Version("0")
 
@@ -408,7 +417,7 @@
 def save_watermark(distro, source, version):
     """Save the watermark for a given source."""
     mark_file = "%s/%s/watermark" \
-                % (ROOT, pool_directory(distro, source["Package"]))
+                % (config.get("filesystem", "workingroot"), pool_directory(distro, source["Package"]))
     mark = open(mark_file, "w")
     try:
         print >>mark, "%s" % version

=== modified file 'update-pool.py'
--- update-pool.py	2010-02-27 05:57:13 +0000
+++ update-pool.py	2010-06-22 18:57:26 +0000
@@ -41,8 +41,8 @@
     # Download the current sources for the given distributions and download
     # any new contents into our pool
     for distro in distros:
-        for dist in DISTROS[distro]["dists"]:
-            for component in DISTROS[distro]["components"]:
+        for dist in config.get(distro, "dists").split():
+            for component in config.get(distro, "components").split():
                 update_sources(distro, dist, component)
 
                 sources = get_sources(distro, dist, component)
@@ -59,7 +59,7 @@
 
 def sources_url(distro, dist, component):
     """Return a URL for a remote Sources.gz file."""
-    mirror = DISTROS[distro]["mirror"]
+    mirror = config.get(distro, "mirror")
     return "%s/dists/%s/%s/source/Sources.gz" % (mirror, dist, component)
 
 def update_sources(distro, dist, component):
@@ -72,7 +72,11 @@
     urlfile = urllib.URLopener()
 
     gzfilename = tempfile.mktemp()
-    urllib.URLopener().retrieve(url, gzfilename)
+    try:
+        urllib.URLopener().retrieve(url, gzfilename)
+    except IOError, e:
+        print e
+        exit(1)
     try:
         gzfile = gzip.GzipFile(gzfilename)
         try:
@@ -87,19 +91,19 @@
     finally:
         os.unlink(gzfilename)
 
-    logging.info("Saved %s", tree.subdir(ROOT, filename))
+    logging.info("Saved %s", tree.subdir(config.get("filesystem", "workingroot"), filename))
     return filename
 
 def update_pool(distro, source):
     """Download a source package into our pool."""
-    mirror = DISTROS[distro]["mirror"]
+    mirror = config.get(distro, "mirror")
     sourcedir = source["Directory"]
 
     pooldir = pool_directory(distro, source["Package"])
 
     for md5sum, size, name in files(source):
         url = "%s/%s/%s" % (mirror, sourcedir, name)
-        filename = "%s/%s/%s" % (ROOT, pooldir, name)
+        filename = "%s/%s/%s" % (config.get("filesystem", "workingroot"), pooldir, name)
 
         if os.path.isfile(filename):
             if os.path.getsize(filename) == int(size):
@@ -108,7 +112,7 @@
         logging.debug("Downloading %s", url)
         ensure(filename)
         urllib.URLopener().retrieve(url, filename)
-        logging.info("Saved %s", tree.subdir(ROOT, filename))
+        logging.info("Saved %s", tree.subdir(config.get("filesystem", "workingroot"), filename))
 
 
 if __name__ == "__main__":

=== modified file 'update-sources.py'
--- update-sources.py	2010-02-26 09:54:47 +0000
+++ update-sources.py	2010-06-22 18:57:26 +0000
@@ -22,7 +22,6 @@
 
 from momlib import *
 
-
 def main(options, args):
     if len(args):
         distros = args
@@ -32,12 +31,18 @@
     # Iterate the pool directory of the given distributions
     for distro in distros:
         try:
+<<<<<<< TREE
             hparts = os.listdir("%s/pool/%s" % (ROOT, distro))
         except OSError, e:
             print e
+=======
+            hparts = os.listdir("%s/pool/%s" % (config.get("filesystem", "workingroot"), distro))
+        except OSError, e:
+            print e
+>>>>>>> MERGE-SOURCE
             continue
         for hpart in hparts:
-            for package in os.listdir("%s/pool/%s/%s" % (ROOT, distro, hpart)):
+            for package in os.listdir("%s/pool/%s/%s" % (config.get("filesystem", "workingroot"), distro, hpart)):
                 update_pool_sources(distro, package)