diff options
| author | Richard Kreuter <richard@10gen.com> | 2010-07-09 13:07:03 -0400 |
|---|---|---|
| committer | Richard Kreuter <richard@10gen.com> | 2010-07-09 13:07:39 -0400 |
| commit | 5f88b9afffdd887f80a6def411a60503dae5373f (patch) | |
| tree | 4457340195d714ae7dd6af8d9821f86904d2eb49 /buildscripts/makedist.py | |
| parent | a9fa60f04ca3511e4940d31ea2fa58119d069c18 (diff) | |
| download | mongo-5f88b9afffdd887f80a6def411a60503dae5373f.tar.gz | |
Fix a bug in inter-package conflict declarations; fix RPM conflicts.
Diffstat (limited to 'buildscripts/makedist.py')
| -rw-r--r-- | buildscripts/makedist.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/buildscripts/makedist.py b/buildscripts/makedist.py index 43d0720d5dd..1928b76755e 100644 --- a/buildscripts/makedist.py +++ b/buildscripts/makedist.py @@ -363,7 +363,8 @@ s/^Package:.*mongodb/Package: {pkg_name}{pkg_name_suffix}\\ Conflicts: {pkg_name_conflicts}/' debian/control; ) || exit 1 ( cd "{pkg_name}{pkg_name_suffix}-{pkg_version}" && sed -i 's|$(CURDIR)/debian/mongodb/|$(CURDIR)/debian/{pkg_name}{pkg_name_suffix}/|g' debian/rules) || exit 1 ( cd "{pkg_name}{pkg_name_suffix}-{pkg_version}" && sed -i 's|debian/mongodb.manpages|debian/{pkg_name}{pkg_name_suffix}.manpages|g' debian/rules) || exit 1 -( cd "{pkg_name}{pkg_name_suffix}-{pkg_version}" && sed -i '/^Name:/s/.*/Name: {pkg_name}{pkg_name_suffix}/; /^Version:/s/.*/Version: {pkg_version}/; /Requires.*mongo/s/mongo/{pkg_name}{pkg_name_suffix}/;' rpm/mongo.spec ) +( cd "{pkg_name}{pkg_name_suffix}-{pkg_version}" && sed -i '/^Name:/s/.*/Name: {pkg_name}{pkg_name_suffix}\\ +Conflicts: {pkg_name_conflicts}/; /^Version:/s/.*/Version: {pkg_version}/; /Requires.*mongo/s/mongo/{pkg_name}{pkg_name_suffix}/;' rpm/mongo.spec ) # Debian systems require some ridiculous workarounds to get an init # script at /etc/init.d/mongodb when the packge name isn't the init # script name. Note: dh_installinit --name won't work, because that @@ -661,7 +662,7 @@ class ScriptFile(object): mongo_pub_version = version.lstrip('n') if version[0] in 'n' else 'latest' pkg_name_suffix = pkg_name_suffix if pkg_name_suffix else '' pkg_version = pkg_version - pkg_name_conflicts = self.configurator.default("pkg_name_conflicts") if pkg_name_suffix else [] + pkg_name_conflicts = list(self.configurator.default("pkg_name_conflicts") if pkg_name_suffix else []) pkg_name_conflicts.remove(pkg_name_suffix) if pkg_name_suffix and pkg_name_suffix in pkg_name_conflicts else [] formatter = self.configurator.default("get_mongo") + self.configurator.default("mangle_mongo") + (self.configurator.nightly_build_mangle_files if version[0] == 'n' else '') +(self.configurator.default("build_prerequisites") if version[0] != 'n' else '') + self.configurator.default("install_for_packaging") + self.configurator.default("build_package") script+=self.fmt(formatter, |