From: Mark Hymers <mhy@debian.org>
Date: Sat, 24 Jan 2009 19:13:26 +0000 (+0000)
Subject: Merge commit 'ftpmaster/master' into regexes
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cdffcfe2a0e6804ed35df56c4c2aa084c2b63677;p=dak

Merge commit 'ftpmaster/master' into regexes

Conflicts:

	dak/make_maintainers.py
	dak/new_security_install.py
	dak/process_accepted.py

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

cdffcfe2a0e6804ed35df56c4c2aa084c2b63677
diff --cc dak/make_maintainers.py
index 3f6fd4c5,679ed223..55cc4a9b
--- a/dak/make_maintainers.py
+++ b/dak/make_maintainers.py
@@@ -131,9 -130,9 +131,9 @@@ def main()
  
      # Process any additional Maintainer files (e.g. from pseudo packages)
      for filename in extra_files:
-         file = utils.open_file(filename)
-         for line in file.readlines():
+         extrafile = utils.open_file(filename)
+         for line in extrafile.readlines():
 -            line = utils.re_comments.sub('', line).strip()
 +            line = re_comments.sub('', line).strip()
              if line == "":
                  continue
              split = line.split()
diff --cc dak/process_accepted.py
index f066614f,a25c391f..a29c8921
--- a/dak/process_accepted.py
+++ b/dak/process_accepted.py
@@@ -536,14 -535,14 +536,14 @@@ def stable_install (summary, short_summ
          os.unlink (new_changelog_filename)
  
      new_changelog = utils.open_file(new_changelog_filename, 'w')
-     for file in files.keys():
-         if files[file]["type"] == "deb":
-             new_changelog.write("stable/%s/binary-%s/%s\n" % (files[file]["component"], files[file]["architecture"], file))
-         elif re_issource.match(file):
-             new_changelog.write("stable/%s/source/%s\n" % (files[file]["component"], file))
+     for newfile in files.keys():
+         if files[newfile]["type"] == "deb":
+             new_changelog.write("stable/%s/binary-%s/%s\n" % (files[newfile]["component"], files[newfile]["architecture"], newfile))
 -        elif utils.re_issource.match(newfile):
++        elif re_issource.match(newfile):
+             new_changelog.write("stable/%s/source/%s\n" % (files[newfile]["component"], newfile))
          else:
-             new_changelog.write("%s\n" % (file))
+             new_changelog.write("%s\n" % (newfile))
 -    chop_changes = queue.re_fdnic.sub("\n", changes["changes"])
 +    chop_changes = re_fdnic.sub("\n", changes["changes"])
      new_changelog.write(chop_changes + '\n\n')
      if os.access(changelog_filename, os.R_OK) != 0:
          changelog = utils.open_file(changelog_filename)