diff --git a/ChangeLog b/ChangeLog index 46dd6e1f..a34c1411 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,11 @@ Unreleased -- Make osg-build log messages look nicer by replacing the - 'LOGLEVEL:osg-build:' prefix with a plain ' >> ' -* Thu Aug 04 2016 Mátyás Selmeci - 1.7.0 +* Fri Aug 05 2016 Mátyás Selmeci - 1.7.0 - Add three-way diff functionality (--diff3 or -3) to osg-import-srpm +- Make osg-build log messages look nicer by replacing the + 'LOGLEVEL:osg-build:' prefix with a plain ' >> ' +- Remove broken test_mock_auto_cfg +- Tweak language in osg-import-srpm when creating .source files * Mon Jun 27 2016 Carl Edquist - 1.6.4 - Rename koji-hub.batlab.org to koji.chtc.wisc.edu (SOFTWARE-2175) diff --git a/osg-import-srpm b/osg-import-srpm index 18a8ff05..a974d273 100755 --- a/osg-import-srpm +++ b/osg-import-srpm @@ -140,7 +140,7 @@ def make_source_file(url, cached_filename, upstream_dir, provider=None): """ % locals() if os.path.exists(source_filename): - logging.info("Source file exists. Saving as %s.old", source_filename) + logging.info("%s already exists. Backing it up as %s.old", source_filename, source_filename) shutil.move(source_filename, source_filename + ".old") utils.unslurp(source_filename, source_contents) else: