Merge branch 'maint' into master

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>

Conflicts:
	doc/appendix/guides/import-existing-ssh-keys.txt
	misc/bcfg2.spec
	src/lib/Bcfg2/Client/Tools/VCS.py
	src/lib/Bcfg2/Client/Tools/YUM.py
	src/lib/Bcfg2/Encryption.py
	src/lib/Bcfg2/Reporting/Collector.py
	src/lib/Bcfg2/Reporting/Storage/DjangoORM.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/FileMonitor/__init__.py
	src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Metadata.py
	src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
	src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
	src/lib/Bcfg2/settings.py
	src/sbin/bcfg2-crypt
	src/sbin/bcfg2-reports
	src/sbin/bcfg2-yum-helper
	testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestAugeas.py

1 files changed, 2 insertions, 39 deletions

diff --git a/tools/export.py b/tools/export.py
index bdb85de41..6b0238bbb 100755
--- a/tools/export.py
+++ b/tools/export.py
@@ -163,43 +163,6 @@ E.G. 1.2.0pre1 is a valid version.
             print(help_message)
             quit()
 
-    if version_info['build'] == '':
-        rpmchangelog = ["* %s %s <%s> %s-1\n" %
-                        (datetime.datetime.now().strftime("%a %b %d %Y"),
-                         name, email, version_release),
-                        "- New upstream release\n", "\n"]
-    else:
-        rpmchangelog = ["* %s %s <%s> %s-0.%s.%s\n" %
-                        (datetime.datetime.now().strftime("%a %b %d %Y"),
-                         name, email, version_release,
-                         version_info['build'][-1], version_info['build']),
-                        "- New upstream release\n", "\n"]
-
-    # write out the new RPM changelog
-    specs = ["misc/bcfg2.spec",
-             "misc/bcfg2-selinux.spec"]
-    if options.dryrun:
-        print("*** Add the following to the top of the %%changelog section in %s:\n%s\n"
-              % (rpmchangelog, " and ".join(specs)))
-    else:
-        for fname in specs:
-            try:
-                lines = open(fname).readlines()
-                for lineno in range(len(lines)):
-                    if lines[lineno].startswith("%changelog"):
-                        break
-                else:
-                    print("No %changelog section found in %s" % fname)
-                    continue
-                for line in reversed(rpmchangelog):
-                    lines.insert(lineno + 1, line)
-                open(fname, 'w').write("".join(lines))
-            except:
-                err = sys.exc_info()[1]
-                print("Could not write %s: %s" % (fname, err))
-                print(help_message)
-                quit()
-
     # update solaris version
     find_and_replace('solaris/Makefile', 'VERS=',
                      'VERS=%s-1\n' % version,
@@ -307,12 +270,12 @@ E.G. 1.2.0pre1 is a valid version.
     # http://trac.mcs.anl.gov/projects/bcfg2/ticket/1129
     find_and_replace('misc/bcfg2.spec',
                      'Source0',
-                     'Source0:          ftp://ftp.mcs.anl.gov/pub/bcfg/%%{name}-%%{version}%s.tar.gz\n' % version_info["build"],
+                     'Source0:          ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}%{?_pre_rc}.tar.gz\n',
                      startswith=True,
                      dryrun=options.dryrun)
     find_and_replace('misc/bcfg2-selinux.spec',
                      'Source0',
-                     'Source0:          ftp://ftp.mcs.anl.gov/pub/bcfg/%%{name}-%%{version}%s.tar.gz\n' % version_info["build"],
+                     'Source0:          ftp://ftp.mcs.anl.gov/pub/bcfg/%{name}-%{version}%{?_pre_rc}.tar.gz\n',
                      startswith=True,
                      dryrun=options.dryrun)
     # update the version in reports