From 5788426515494d26aa250b6b78936b77b5f9b18e Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Fri, 5 Aug 2016 14:15:10 -0500 Subject: [PATCH 1/2] Tweak language in osg-import-srpm when creating .source files --- ChangeLog | 1 + osg-import-srpm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 46dd6e1f..ffd79e25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ Unreleased - Make osg-build log messages look nicer by replacing the 'LOGLEVEL:osg-build:' prefix with a plain ' >> ' +- Tweak language in osg-import-srpm when creating .source files * Thu Aug 04 2016 Mátyás Selmeci - 1.7.0 - Add three-way diff functionality (--diff3 or -3) to osg-import-srpm 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: From 442a94dd5153c1cfe404812802d83d02cc4de2da Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Thu, 4 Aug 2016 14:46:56 -0500 Subject: [PATCH 2/2] Add last-minute changes to 1.7.0 (SOFTWARE-2422) --- ChangeLog | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ffd79e25..a34c1411 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,12 @@ Unreleased + +* 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 -* Thu Aug 04 2016 Mátyás Selmeci - 1.7.0 -- Add three-way diff functionality (--diff3 or -3) to osg-import-srpm - * Mon Jun 27 2016 Carl Edquist - 1.6.4 - Rename koji-hub.batlab.org to koji.chtc.wisc.edu (SOFTWARE-2175) - Do not enforce vcs branch checks for scratch builds (SOFTWARE-1876)