[27904] in Source-Commits
build-system commit: Remove special-case clauses from dapopulate
daemon@ATHENA.MIT.EDU (Victor Vasiliev)
Thu Mar 27 15:38:28 2014
Date: Thu, 27 Mar 2014 15:38:22 -0400
From: Victor Vasiliev <vasilvv@MIT.EDU>
Message-Id: <201403271938.s2RJcMDs013762@drugstore.mit.edu>
To: source-commits@MIT.EDU
https://github.com/mit-athena/build-system/commit/200e781845ab24ad000ff8f97ba0f93b0df1733e
commit 200e781845ab24ad000ff8f97ba0f93b0df1733e
Author: Victor Vasiliev <vasilvv@mit.edu>
Date: Thu Mar 27 15:32:01 2014 -0400
Remove special-case clauses from dapopulate
All the packages in question were removed from the super-repository
or no longer cause issues.
dapopulate | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/dapopulate b/dapopulate
index 3f6abb9..0419c4e 100755
--- a/dapopulate
+++ b/dapopulate
@@ -41,9 +41,6 @@ def main():
print "Scanning the source checkout to determine the latest released versions"
packages = []
for package_name, package_path in dabuildsys.package_map.iteritems():
- # FIXME FIXME we need to sort this out
- if package_name in {'libhesiod', 'cluster-cups-config', 'locker-support', 'finger-config', 'fingerd-config', 'debathena-libreadline', 'debathena-live', 'command-not-found'}:
- continue
try:
package = dabuildsys.PackageCheckout(package_name)
if args.donor not in package.get_supported_releases():
@@ -60,11 +57,11 @@ def main():
packages.append( (package_name, version) )
except IOError as err:
# FIXME FIXME prithee FIXME
- if package_name != 'cviewd' and package_name != 'debathena-common':
- equivs_path, = glob.glob(os.path.join(package_path, '*.equivs'))
- with open( equivs_path ) as f:
- equivs = list(debian.deb822.Deb822.iter_paragraphs(f))
- packages.append( (package_name, debian.debian_support.Version(equivs[1]['Version']) ) )
+ # This code should be gone once equivs packages are gone
+ equivs_path, = glob.glob(os.path.join(package_path, '*.equivs'))
+ with open( equivs_path ) as f:
+ equivs = list(debian.deb822.Deb822.iter_paragraphs(f))
+ packages.append( (package_name, debian.debian_support.Version(equivs[1]['Version']) ) )
else:
raise
