#341 Post black changes
Merged 5 years ago by ngompa. Opened 5 years ago by churchyard.
churchyard/FedoraReview black_post  into  master

file modified
+6 -8
@@ -38,7 +38,7 @@ 

          "experiment/src/contrib/PACKAGES",

          "https://www.bioconductor.org/packages/release/data/"

          "annotation/src/contrib/PACKAGES",

-         "https://www.bioconductor.org/packages/release/bioc/" "src/contrib/PACKAGES",

+         "https://www.bioconductor.org/packages/release/bioc/src/contrib/PACKAGES",

          "https://cran.r-project.org/src/contrib/PACKAGES",

          "https://r-forge.r-project.org/src/contrib/PACKAGES",

      ]
@@ -221,7 +221,7 @@ 

                  b_dir = True

              if (

                  rpm.expandMacro(

-                     "test -d %{packname}/src && " "(cd %{packname}/src; rm -f *.o *.so)"

+                     "test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so)"

                  )

                  in line

              ):
@@ -240,15 +240,13 @@ 

          else:

              cmt = ""

              if not b_dir:

-                 cmt += "Package doesn't have the standard " "directory creation.\n"

+                 cmt += "Package doesn't have the standard directory creation.\n"

              if not b_test:

-                 cmt += "Package doesn't have the standard " "removal of *.o and *.so.\n"

+                 cmt += "Package doesn't have the standard removal of *.o and *.so.\n"

              if not b_rm:

-                 cmt += (

-                     "Package doesn't have the standard " "removal of the R.css file\n"

-                 )

+                 cmt += "Package doesn't have the standard removal of the R.css file\n"

              if not b_install:

-                 cmt += "Package doesn't have the standard " "R CMD INSTALL function\n"

+                 cmt += "Package doesn't have the standard R CMD INSTALL function\n"

              self.set_passed(self.FAIL, cmt)

  

  

file modified
+6 -6
@@ -95,10 +95,10 @@ 

                  self.set_passed(self.PASS)

          else:

              self.url = (

-                 "https://fedoraproject.org/wiki/Changes/" "Removing_ldconfig_scriptlets"

+                 "https://fedoraproject.org/wiki/Changes/Removing_ldconfig_scriptlets"

              )

              self.text = (

-                 "ldconfig not called in %post and %postun " "for Fedora 28 and later."

+                 "ldconfig not called in %post and %postun for Fedora 28 and later."

              )

              if bad_pkgs:

                  self.set_passed(
@@ -174,7 +174,7 @@ 

              "/packaging-guidelines/#_devel_packages"

          )

          self.text = (

-             "Development (unversioned) .so files " "in -devel subpackage, if present."

+             "Development (unversioned) .so files in -devel subpackage, if present."

          )

          self.automatic = True

          self.type = "MUST"
@@ -301,7 +301,7 @@ 

                  break

          else:

              self.set_passed(

-                 self.FAIL, "Bundled gnulib but no " "Provides: bundled(gnulib)"

+                 self.FAIL, "Bundled gnulib but no Provides: bundled(gnulib)"

              )

  

  
@@ -330,7 +330,7 @@ 

      def __init__(self, base):

          CCppCheckBase.__init__(self, base)

          self.url = (

-             "https://docs.fedoraproject.org/en-US/packaging-guidelines" "/C_and_C++/"

+             "https://docs.fedoraproject.org/en-US/packaging-guidelines/C_and_C++/"

          )

          self.text = (

              "If your application is a C or C++ application you must "
@@ -344,7 +344,7 @@ 

          br = self.spec.build_requires

          if not "gcc" in br and not "gcc-c++" in br and not "clang" in br:

              self.set_passed(

-                 self.FAIL, "No gcc, gcc-c++ or clang found in " "BuildRequires"

+                 self.FAIL, "No gcc, gcc-c++ or clang found in BuildRequires"

              )

              return

          self.set_passed(self.PASS)

file modified
+31 -49
@@ -108,10 +108,8 @@ 

  

      def __init__(self, base):

          GenericCheckBase.__init__(self, base)

-         self.url = (

-             "https://docs.fedoraproject.org/en-US" "/packaging-guidelines/#bundling"

-         )

-         self.text = "Package contains no bundled libraries without" " FPC exception."

+         self.url = "https://docs.fedoraproject.org/en-US/packaging-guidelines/#bundling"

+         self.text = "Package contains no bundled libraries without FPC exception."

          self.automatic = True

          self.type = "MUST"

  
@@ -145,7 +143,7 @@ 

              "https://docs.fedoraproject.org/en-US"

              "/packaging-guidelines/#_compiler_flags"

          )

-         self.text = "%build honors applicable compiler flags or " "justifies otherwise."

+         self.text = "%build honors applicable compiler flags or justifies otherwise."

          self.automatic = True

          self.type = "MUST"

          self.needs.append("generic-large-data")  # Ensure unpacked rpms
@@ -164,7 +162,7 @@ 

      def __init__(self, base):

          GenericCheckBase.__init__(self, base)

          self.url = (

-             "https://docs.fedoraproject.org/en-US" "/packaging-guidelines/#changelogs"

+             "https://docs.fedoraproject.org/en-US/packaging-guidelines/#changelogs"

          )

          self.text = "Changelog in prescribed format."

          self.automatic = False
@@ -181,7 +179,7 @@ 

              "/packaging-guidelines/what-can-be-packaged"

              "/#_impermissible_content"

          )

-         self.text = "Sources contain only permissible" " code or content."

+         self.text = "Sources contain only permissible code or content."

          self.automatic = False

          self.type = "MUST"

  
@@ -195,7 +193,7 @@ 

              "https://docs.fedoraproject.org/en-US"

              "/packaging-guidelines/#_configuration_files"

          )

-         self.text = "%config files are marked noreplace or the reason" " is justified."

+         self.text = "%config files are marked noreplace or the reason is justified."

          self.automatic = True

          self.type = "MUST"

  
@@ -339,7 +337,7 @@ 

              "https://docs.fedoraproject.org/en-US"

              "/packaging-guidelines/#_source_rpm_buildtime_macros"

          )

-         self.text = "Macros in Summary, %description expandable at" " SRPM build time."

+         self.text = "Macros in Summary, %description expandable at SRPM build time."

          self.automatic = True

          self.type = "MUST"

  
@@ -370,7 +368,7 @@ 

              "https://docs.fedoraproject.org/en-US"

              "/packaging-guidelines/#_desktop_files"

          )

-         self.text = "Package contains desktop file if it is a GUI" " application."

+         self.text = "Package contains desktop file if it is a GUI application."

          self.automatic = True

          self.type = "MUST"

  
@@ -430,9 +428,7 @@ 

  

      def __init__(self, base):

          GenericCheckBase.__init__(self, base)

-         self.url = (

-             "https://docs.fedoraproject.org/en-US" "/packaging-guidelines/DistTag/"

-         )

+         self.url = "https://docs.fedoraproject.org/en-US/packaging-guidelines/DistTag/"

          self.text = "Dist tag is present."

          self.automatic = True

          self.type = "MUST"
@@ -619,9 +615,7 @@ 

              "https://docs.fedoraproject.org/en-US"

              "/packaging-guidelines/#_documentation"

          )

-         self.text = (

-             "Large documentation files are in a -doc" " subpackage, if required."

-         )

+         self.text = "Large documentation files are in a -doc subpackage, if required."

          self.automatic = False

          self.type = "MUST"

  
@@ -642,9 +636,7 @@ 

              "/packaging-guidelines/LicensingGuidelines/"

              "#_valid_license_short_names"

          )

-         self.text = (

-             "License field in the package spec file" " matches the actual license."

-         )

+         self.text = "License field in the package spec file matches the actual license."

          self.automatic = True

          self.type = "MUST"

  
@@ -836,7 +828,7 @@ 

              "/#subpackage-licensing"

          )

          self.text = (

-             "License file installed when any subpackage" " combination is installed."

+             "License file installed when any subpackage combination is installed."

          )

          self.automatic = False

          self.type = "MUST"
@@ -872,9 +864,7 @@ 

  

      def __init__(self, base):

          GenericCheckBase.__init__(self, base)

-         self.url = (

-             "https://docs.fedoraproject.org/en-US" "/packaging-guidelines/#_macros"

-         )

+         self.url = "https://docs.fedoraproject.org/en-US/packaging-guidelines/#_macros"

          self.text = (

              "Package consistently uses macros"

              " (instead of hard-coded directory names)."
@@ -888,9 +878,7 @@ 

  

      def __init__(self, base):

          GenericCheckBase.__init__(self, base)

-         self.url = (

-             "https://docs.fedoraproject.org/en-US" "/packaging-guidelines/#_macros"

-         )

+         self.url = "https://docs.fedoraproject.org/en-US/packaging-guidelines/#_macros"

          self.text = "Package uses either  %{buildroot} or $RPM_BUILD_ROOT"

          self.automatic = True

          self.type = "MUST"
@@ -961,16 +949,14 @@ 

  

      def __init__(self, base):

          GenericCheckBase.__init__(self, base)

-         self.url = (

-             "https://docs.fedoraproject.org/en-US" "/packaging-guidelines/Naming/"

-         )

+         self.url = "https://docs.fedoraproject.org/en-US/packaging-guidelines/Naming/"

          self.text = "Package is named using only allowed ASCII characters."

          self.automatic = True

          self.type = "MUST"

  

      def run_on_applicable(self):

          allowed_chars = (

-             "abcdefghijklmnopqrstuvwxyz" "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._+"

+             "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._+"

          )

          output = ""

          passed = True
@@ -994,10 +980,8 @@ 

  

      def __init__(self, base):

          GenericCheckBase.__init__(self, base)

-         self.url = (

-             "https://docs.fedoraproject.org/en-US" "/packaging-guidelines/Naming/"

-         )

-         self.text = "Package is named according to the Package Naming" " Guidelines."

+         self.url = "https://docs.fedoraproject.org/en-US/packaging-guidelines/Naming/"

+         self.text = "Package is named according to the Package Naming Guidelines."

          self.automatic = False

          self.type = "MUST"

  
@@ -1046,7 +1030,7 @@ 

      def __init__(self, base):

          GenericCheckBase.__init__(self, base)

          self.url = (

-             "https://docs.fedoraproject.org/en-US" "/packaging-guidelines/#_conflicts"

+             "https://docs.fedoraproject.org/en-US/packaging-guidelines/#_conflicts"

          )

          self.text = "Package does not generate any conflict."

          self.automatic = True
@@ -1055,7 +1039,7 @@ 

      def run(self):

          text = None

          if self.spec.expand_tag("Conflicts"):

-             text = "Package contains Conflicts: tag(s)" " needing fix or justification."

+             text = "Package contains Conflicts: tag(s) needing fix or justification."

          self.set_passed(self.PENDING, text)

  

  
@@ -1195,9 +1179,7 @@ 

              "https://docs.fedoraproject.org/en-US"

              "/packaging-guidelines/#_file_and_directory_ownership"

          )

-         self.text = (

-             "Package does not own files or directories" " owned by other packages."

-         )

+         self.text = "Package does not own files or directories owned by other packages."

          self.automatic = True

          self.type = "MUST"

  
@@ -1293,7 +1275,7 @@ 

      def __init__(self, base):

          GenericCheckBase.__init__(self, base)

          self.url = (

-             "https://docs.fedoraproject.org/en-US" "/packaging-guidelines/SourceURL/"

+             "https://docs.fedoraproject.org/en-US/packaging-guidelines/SourceURL/"

          )

          self.text = (

              "Sources used to build the package match the"
@@ -1357,7 +1339,7 @@ 

              self.log.debug("No testable sources")

              self.set_passed(

                  self.PENDING,

-                 "Package has no sources or they" " are generated by developer",

+                 "Package has no sources or they are generated by developer",

              )

              return

          msg = "Check did not complete"
@@ -1543,7 +1525,7 @@ 

              "https://docs.fedoraproject.org/en-US"

              "/packaging-guidelines/#_debuginfo_packages"

          )

-         self.text = "Useful -debuginfo package or justification" " otherwise."

+         self.text = "Useful -debuginfo package or justification otherwise."

          self.automatic = False

          self.type = "MUST"

  
@@ -1646,7 +1628,7 @@ 

  

      def __init__(self, base):

          GenericCheckBase.__init__(self, base)

-         self.url = "https://fedoraproject.org/wiki/EPEL" ":Packaging#Icon_Cache"

+         self.url = "https://fedoraproject.org/wiki/EPEL:Packaging#Icon_Cache"

          self.text = (

              "gtk-update-icon-cache is invoked in %postun"

              " and %posttrans if package contains icons."
@@ -1691,7 +1673,7 @@ 

  

      def __init__(self, base):

          GenericCheckBase.__init__(self, base)

-         self.url = "https://fedoraproject.org/wiki/EPEL" ":Packaging#desktop-database"

+         self.url = "https://fedoraproject.org/wiki/EPEL:Packaging#desktop-database"

          self.text = (

              "update-desktop-database is invoked in %post and"

              " %postun if package contains desktop file(s)"
@@ -1811,7 +1793,7 @@ 

  

      def __init__(self, base):

          GenericCheckBase.__init__(self, base)

-         self.url = "https://fedoraproject.org/wiki/EPEL" ":Packaging#GTK.2B_modules"

+         self.url = "https://fedoraproject.org/wiki/EPEL:Packaging#GTK.2B_modules"

          self.text = "gtk-query-immodules is invoked when required"

  

          self.automatic = True
@@ -1849,7 +1831,7 @@ 

                  "Packaging:Scriptlets&oldid=494555#GTK.2B_modules"

              )

              self.text = (

-                 "gtk-query-immodules must not be invoked for" " Fedora 24 and later."

+                 "gtk-query-immodules must not be invoked for Fedora 24 and later."

              )

              self.set_passed(self.FAIL if failed else self.NA, text)

  
@@ -1859,7 +1841,7 @@ 

  

      def __init__(self, base):

          GenericCheckBase.__init__(self, base)

-         self.url = "https://fedoraproject.org/wiki/EPEL" ":Packaging#GSettings_Schema"

+         self.url = "https://fedoraproject.org/wiki/EPEL:Packaging#GSettings_Schema"

          self.text = (

              "glib-compile-schemas is run in %postun and"

              " %posttrans if package has *.gschema.xml files. "
@@ -1970,7 +1952,7 @@ 

  

      def __init__(self, base):

          GenericCheckBase.__init__(self, base)

-         self.url = "https://fedoraproject.org/wiki/EPEL" ":Packaging#gdk-pixbuf_loaders"

+         self.url = "https://fedoraproject.org/wiki/EPEL:Packaging#gdk-pixbuf_loaders"

          self.text = (

              "gdk-pixbuf-query-loaders is invoked in %post and"

              " %postun to update gdk-pixbuf"
@@ -2164,7 +2146,7 @@ 

              provides = deps.list_provides(pkg)

              if any("deprecated()" in p for p in provides):

                  self.set_passed(

-                     self.FAIL, pkg + " is deprecated, you must " "not depend on it."

+                     self.FAIL, pkg + " is deprecated, you must not depend on it."

                  )

                  return

  

file modified
+3 -3
@@ -271,7 +271,7 @@ 

                  bad_ones = list(set(bad_ones))

                  self.set_passed(self.FAIL, "--no-build: package(s) not installed")

                  self.log.info(

-                     "Packages required by --no-build are" " not installed: %s",

+                     "Packages required by --no-build are not installed: %s",

                      ", ".join(bad_ones),

                  )

              return
@@ -298,7 +298,7 @@ 

      def __init__(self, base):

          BuildCheckBase.__init__(self, base)

          self.url = (

-             "https://docs.fedoraproject.org/en-US" "/packaging-guidelines/#_use_rpmlint"

+             "https://docs.fedoraproject.org/en-US/packaging-guidelines/#_use_rpmlint"

          )

          self.text = "Rpmlint is run on all installed packages."

          self.automatic = True
@@ -335,7 +335,7 @@ 

      def __init__(self, base):

          BuildCheckBase.__init__(self, base)

          self.url = (

-             "https://docs.fedoraproject.org/en-US" "/packaging-guidelines/#_use_rpmlint"

+             "https://docs.fedoraproject.org/en-US/packaging-guidelines/#_use_rpmlint"

          )

          self.text = "Rpmlint is run on debuginfo package(s)."

          self.automatic = True

file modified
+15 -15
@@ -60,7 +60,7 @@ 

  

      def __init__(self, base):

          GenericShouldCheckBase.__init__(self, base)

-         self.url = "https://fedoraproject.org/wiki/" "PackageMaintainers/MockTricks"

+         self.url = "https://fedoraproject.org/wiki/PackageMaintainers/MockTricks"

          self.text = "Reviewer should test that the package builds in mock."

          self.automatic = True

          self.type = "SHOULD"
@@ -167,7 +167,7 @@ 

              "/packaging-guidelines/#_file_and_directory_dependencies"

          )

          self.text = (

-             "No file requires outside of" " /etc, /bin, /sbin, /usr/bin, /usr/sbin."

+             "No file requires outside of /etc, /bin, /sbin, /usr/bin, /usr/sbin."

          )

          self.automatic = True

          self.type = "SHOULD"
@@ -222,7 +222,7 @@ 

      def __init__(self, base):

          GenericShouldCheckBase.__init__(self, base)

          self.url = "https://docs.fedoraproject.org/en-US/packaging-guidelines/"

-         self.text = "Final provides and requires are sane" " (see attachments)."

+         self.text = "Final provides and requires are sane (see attachments)."

          self.automatic = False

          self.type = "SHOULD"

  
@@ -253,7 +253,7 @@ 

              "https://docs.fedoraproject.org/en-US"

              "/packaging-guidelines/#_requiring_base_package"

          )

-         self.text = "Fully versioned dependency in subpackages" " if applicable."

+         self.text = "Fully versioned dependency in subpackages if applicable."

          self.automatic = True

          self.type = "SHOULD"

  
@@ -294,7 +294,7 @@ 

              "/packaging-guidelines/#_tags_and_sections"

          )

          self.text = (

-             "Packager, Vendor, PreReq, Copyright tags should not be " "in spec file"

+             "Packager, Vendor, PreReq, Copyright tags should not be in spec file"

          )

          self.automatic = True

          self.type = "SHOULD"
@@ -340,7 +340,7 @@ 

              "/packaging-guidelines/LicensingGuidelines/#_license_text"

          )

          self.text = (

-             "Package does not include license text files" " separate from upstream."

+             "Package does not include license text files separate from upstream."

          )

          self.automatic = False

          self.type = "SHOULD"
@@ -356,7 +356,7 @@ 

      def __init__(self, base):

          GenericShouldCheckBase.__init__(self, base)

          self.url = (

-             "https://docs.fedoraproject.org/en-US" "/packaging-guidelines/#_manpages"

+             "https://docs.fedoraproject.org/en-US/packaging-guidelines/#_manpages"

          )

          self.text = "Man pages included for all executables."

          self.automatic = False
@@ -480,7 +480,7 @@ 

      def __init__(self, base):

          GenericShouldCheckBase.__init__(self, base)

          self.url = (

-             "https://docs.fedoraproject.org/en-US" "/packaging-guidelines/#_scriptlets"

+             "https://docs.fedoraproject.org/en-US/packaging-guidelines/#_scriptlets"

          )

          self.text = "Scriptlets must be sane, if used."

          self.automatic = False
@@ -655,7 +655,7 @@ 

      def __init__(self, base):

          GenericShouldCheckBase.__init__(self, base)

          self.url = (

-             "https://docs.fedoraproject.org/en-US" "/packaging-guidelines/#_test_suites"

+             "https://docs.fedoraproject.org/en-US/packaging-guidelines/#_test_suites"

          )

          self.text = "%check is present and all tests pass."

          self.automatic = False
@@ -668,10 +668,10 @@ 

      def __init__(self, base):

          GenericShouldCheckBase.__init__(self, base)

          self.url = (

-             "https://docs.fedoraproject.org/en-US" "/packaging-guidelines/#_timestamps"

+             "https://docs.fedoraproject.org/en-US/packaging-guidelines/#_timestamps"

          )

          self.text = (

-             "Packages should try to preserve timestamps of" " original installed files."

+             "Packages should try to preserve timestamps of original installed files."

          )

          self.automatic = False

          self.type = "SHOULD"
@@ -686,7 +686,7 @@ 

              "https://docs.fedoraproject.org/en-US"

              "/packaging-guidelines/#_global_preferred_over_define"

          )

-         self.text = "Spec use %global instead of %define unless" " justified."

+         self.text = "Spec use %global instead of %define unless justified."

          self.automatic = True

          self.type = "SHOULD"

  
@@ -711,7 +711,7 @@ 

              "https://docs.fedoraproject.org/en-US/packaging-guidelines/Tmpfiles.d/"

          )

          self.text = (

-             "Files in /run, var/run and /var/lock uses tmpfiles.d" " when appropriate"

+             "Files in /run, var/run and /var/lock uses tmpfiles.d when appropriate"

          )

          self.automatic = True

          self.type = "SHOULD"
@@ -756,7 +756,7 @@ 

      def __init__(self, base):

          GenericShouldCheckBase.__init__(self, base)

          self.url = (

-             "https://docs.fedoraproject.org/en-US" "/packaging-guidelines/SourceURL/"

+             "https://docs.fedoraproject.org/en-US/packaging-guidelines/SourceURL/"

          )

          self.text = "Sources can be downloaded from URI in Source: tag"

          self.automatic = True
@@ -781,7 +781,7 @@ 

  

      def __init__(self, base):

          GenericShouldCheckBase.__init__(self, base)

-         self.url = "https://fedoraproject.org/wiki/EPEL" ":Packaging#mimeinfo"

+         self.url = "https://fedoraproject.org/wiki/EPEL:Packaging#mimeinfo"

          self.text = (

              "update-mime-database is invoked in %posttrans and"

              " %postun if package stores mime configuration"

file modified
+2 -2
@@ -34,7 +34,7 @@ 

      def __init__(self, checks):

          PerlCheckBase.__init__(self, checks)

          self.url = "https://docs.fedoraproject.org/en-US/packaging-guidelines/Perl/"

-         self.text = "Package contains the mandatory BuildRequires" " and Requires:."

+         self.text = "Package contains the mandatory BuildRequires and Requires:."

          self.automatic = True

  

      def run_on_applicable(self):
@@ -49,7 +49,7 @@ 

          for br in self.spec.build_requires:

              if br.startswith("perl-devel"):

                  self.set_passed(

-                     self.FAIL, "Explicit dependency on perl-devel" " is not allowed"

+                     self.FAIL, "Explicit dependency on perl-devel is not allowed"

                  )

                  return

          compat = rpm.expandMacro(perl_compat)

file modified
+1 -1
@@ -72,7 +72,7 @@ 

          rr = self.spec.get_requires()

  

          if regex.search("\n".join(br)) or regex.search("\n".join(rr)):

-             self.set_passed(self.FAIL, "Unversionned Python dependency " "found.")

+             self.set_passed(self.FAIL, "Unversionned Python dependency found.")

              return

          self.set_passed(self.PASS)

  

file modified
+3 -3
@@ -140,7 +140,7 @@ 

          if _has_extension(self):

              self.set_passed(

                  "noarch" not in arch,

-                 "Package with binary extension can't be built" " as noarch.",

+                 "Package with binary extension can't be built as noarch.",

              )

          else:

              self.set_passed("noarch" in arch)
@@ -153,9 +153,9 @@ 

      def __init__(self, base):

          RubyCheckBase.__init__(self, base)

          self.url = _gl_fmt_uri(

-             {"section": "Ruby_packages_with_binary_content." "2Fshared_libraries"}

+             {"section": "Ruby_packages_with_binary_content.2Fshared_libraries"}

          )

-         self.text = "Platform specific files must be located under " "/usr/lib[64]"

+         self.text = "Platform specific files must be located under /usr/lib[64]"

          self.automatic = True

  

      def is_applicable(self):

file modified
+1 -1
@@ -79,6 +79,6 @@ 

      def __init__(self, base):

          SugarActivityCheckBase.__init__(self, base)

          self.url = _SUGAR_URL + "_runtime_dependencies"

-         self.text = "All runtime dependency information need to be" " manually added."

+         self.text = "All runtime dependency information need to be manually added."

          self.type = "MUST"

          self.automatic = False

file modified
+1 -1
@@ -139,7 +139,7 @@ 

          build_data = get_build_data(build_id)

  

          if build_data["status"] != "succeeded":

-             self.log.error("Build did not succeeded in all its chroots." "Exiting.")

+             self.log.error("Build did not succeeded in all its chroots.Exiting.")

              sys.exit(1)

  

          required_chroot = "fedora-rawhide-" + platform.machine()

@@ -51,7 +51,7 @@ 

  

      if not os.access(os.getcwd(), os.R_OK | os.W_OK | os.X_OK):

          raise IOError(

-             "Insufficient permissons for current directory." " Aborting download"

+             "Insufficient permissons for current directory. Aborting download"

          )

      session = koji.ClientSession(opts.huburl)

      for task_id in task_ids:

file modified
+2 -2
@@ -77,7 +77,7 @@ 

          return flags["DISTTAG"].value

      self.log.warning("No disttag found in prebuilt packages")

      self.log.info(

-         "Use --define DISTTAG to set proper dist." " e. g. --define DISTTAG fc21."

+         "Use --define DISTTAG to set proper dist. e. g. --define DISTTAG fc21."

      )

      raise ReviewError(

          "No disttag in package and no DISTTAG flag."
@@ -253,7 +253,7 @@ 

              self.log.debug("_topdir: %s", str(self._topdir))

          except (CalledProcessError, OSError):

              self.log.info(

-                 "Cannot evaluate %topdir in mock, using" " hardcoded /builddir/build"

+                 "Cannot evaluate %topdir in mock, using hardcoded /builddir/build"

              )

              self._topdir = "/builddir/build"

  

@@ -251,7 +251,7 @@ 

          except:

              self.log.debug("Exception down the road...", exc_info=True)

              self.log.error(

-                 "Exception down the road..." "(logs in %s)", Settings.session_log

+                 "Exception down the road... (logs in %s)", Settings.session_log

              )

              rcode = 1

          self.log.debug("Report completed:  %.3f seconds", time.time() - started_at)

file modified
+7 -7
@@ -99,7 +99,7 @@ 

          default=None,

          dest="url",

          metavar="<url>",

-         help="Use another bugzilla, using complete" " url to bug page.",

+         help="Use another bugzilla, using complete url to bug page.",

      )

      modes.add_argument(

          "--copr-build",
@@ -160,7 +160,7 @@ 

          "--cache",

          action="store_true",

          dest="cache",

-         help="Do not redownload files from bugzilla," " use the ones in the cache.",

+         help="Do not redownload files from bugzilla, use the ones in the cache.",

      )

      optional.add_argument(

          "-D",
@@ -169,7 +169,7 @@ 

          action="append",

          dest="flags",

          default=[],

-         help="Define a flag like --define EPEL7 or " " -D EPEL7=1",

+         help="Define a flag like --define EPEL7 or  -D EPEL7=1",

      )

      optional.add_argument(

          "-L",
@@ -230,13 +230,13 @@ 

          action="store_true",

          dest="prebuilt",

          default=False,

-         help="When using -n <name>, use" " prebuilt rpms in current directory.",

+         help="When using -n <name>, use prebuilt rpms in current directory.",

      )

      optional.add_argument(

          "-s",

          "--single",

          metavar="<test>",

-         help="Single test to run, as named by " "--display-checks.",

+         help="Single test to run, as named by --display-checks.",

      )

      optional.add_argument(

          "-r",
@@ -244,7 +244,7 @@ 

          action="store_true",

          dest="rpm_spec",

          default=False,

-         help="Take spec file from srpm instead of separate" "url.",

+         help="Take spec file from srpm instead of separate url.",

      )

      optional.add_argument(

          "-v",
@@ -471,7 +471,7 @@ 

              _make_log_dir()

              logging.basicConfig(

                  level=logging.DEBUG,

-                 format="%(asctime)s %(name)-12s" " %(levelname)-8s %(message)s",

+                 format="%(asctime)s %(name)-12s %(levelname)-8s %(message)s",

                  datefmt="%m-%d %H:%M",

                  filename=SESSION_LOG,

                  filemode="w",

@@ -78,7 +78,7 @@ 

          )

          if not rv:

              self.log.debug(

-                 "Cannot unpack %s, so probably not an " "archive. Copying instead",

+                 "Cannot unpack %s, so probably not an archive. Copying instead",

                  self.filename,

              )

              shutil.copy(os.path.join(self._unpacked_src, self.filename), extract_dir)

file modified
+1 -1
@@ -68,7 +68,7 @@ 

          )

          self.assertEqual(

              self.bug.spec_url,

-             "http://timlau.fedorapeople.org/files/test/" "review-test/python-test.spec",

+             "http://timlau.fedorapeople.org/files/test/review-test/python-test.spec",

          )

  

          cd = os.path.abspath("./srpm")

file modified
+1 -1
@@ -348,7 +348,7 @@ 

          self.assertTrue(os.path.exists(source.filename))

          self.assertEqual(

              source.check_source_checksum(),

-             "7ef644ee4eafa62cfa773cad4056cdcea592e27dacd5ae" "b4e8b11f51f5bf60d3",

+             "7ef644ee4eafa62cfa773cad4056cdcea592e27dacd5aeb4e8b11f51f5bf60d3",

          )

          source.extract()

          self.assertTrue(