#29 Fix typos and update link to guidelines.
Merged 2 years ago by pingou. Opened 2 years ago by qulogic.
qulogic/r2spec typos  into  master

file modified
+3 -3
@@ -141,11 +141,11 @@ 

  #       - Fill the url

  #   * Add %define BioC for the Bioconductor release of Bioconductor packages

  #   * Add check if the package is noarch or not

- #   * Add oportunity to copy the source in the %_topdir defined in .rpmmacros

+ #   * Add opportunity to copy the source in the %_topdir defined in .rpmmacros

  #   * Add a parameter in the config file for the version on Bioconductor used

  #   * Add a Spec class to write the spec file

  #   * Add a Noarch class that inherit the Spec class and handle the noarch package case

- #   * Ask what to do if the specfile is alreay in the current working directory

+ #   * Ask what to do if the specfile is already in the current working directory

  #

  # -Bugs correction

  #   * Catch the Description in the file DESCRIPTION when it is on several lines
@@ -205,7 +205,7 @@ 

  # https://www.gnu.org/licenses/gpl.html

  #

  # This software has been based on the guidelines for R packaging

- # https://fedoraproject.org/wiki/Packaging:R

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

  #

  #***********************************************

  

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

  .SH DESCRIPTION

  

  This tool generate RPM for R libraries according to the Fedora guidelines for R packaging.

- These guidelines are available at: https://fedoraproject.org/wiki/Packaging/R

+ These guidelines are available at: https://docs.fedoraproject.org/en-US/packaging-guidelines/R/

  

  .SH USAGE

  This program generates RPM file for R libraries for Fedora.
@@ -27,7 +27,7 @@ 

  contained in the sources are read (especially those contained in the DESCRIPTION

  file). The sources are then removed from the current working directory (unless

  specified otherwise).

- Finally the spec file is writen to the filesystem using the information collected.

+ Finally the spec file is written to the filesystem using the information collected.

  

  .HP

  R2rpm -u <url to sources>

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

  .SH DESCRIPTION

  

  This tool generate RPM spec file for R libraries according to the Fedora guidelines for R packaging.

- These guidelines are available at: https://fedoraproject.org/wiki/Packaging/R

+ These guidelines are available at: https://docs.fedoraproject.org/en-US/packaging-guidelines/R/

  

  .SH USAGE

  This program generates spec file for R libraries for Fedora.
@@ -27,7 +27,7 @@ 

  contained in the sources are read (especially those contained in the DESCRIPTION

  file). The sources are then removed from the current working directory (unless

  specified otherwise).

- Finally the spec file is writen to the filesystem using the information collected.

+ Finally the spec file is written to the filesystem using the information collected.

  

  .HP

  R2spec -u <url to sources>

file modified
+1 -1
@@ -1,5 +1,5 @@ 

  Name: R2spec

  Author: Pierre-Yves Chibon

  

- R2spec generates RPMs spec file for R libraries according to the R guidelines of Fedora available at https://fedoraproject.org/wiki/Packaging:R.

+ R2spec generates RPMs spec file for R libraries according to the R guidelines of Fedora available at https://docs.fedoraproject.org/en-US/packaging-guidelines/R/.

  It creates the spec file from an input which could be either a source file (*.tar.gz) or a url (https://*.tar.gz).

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

              log = stream.read()

              stream.close()

          except IOError as err:

-             self.log.info('An error occured during the build')

+             self.log.info('An error occurred during the build')

              self.log.debug('ERROR: %s', err)

              print('Stopping')

              return(1)
@@ -169,6 +169,6 @@ 

          if len(self.deps) == 0 and len(self.files) == 0 and self.outcode == 1:

              log = '%s.build.log' % specname

              raise BuildError(

-                 'An error occured at build time, see the log in %s' % log)

+                 'An error occurred at build time, see the log in %s' % log)

  

          return self.files

file modified
+5 -5
@@ -150,7 +150,7 @@ 

  

      def __init__(self):

          """Constructor of the Settings object.

-         This instanciate the Settings object and load into the _dict

+         This instantiates the Settings object and loads into the _dict

          attributes the default configuration which each available option.

          """

          self._dict = {
@@ -225,7 +225,7 @@ 

          self.log = get_logger()

  

      def main(self, args):

-         """ main fonction for R2spec.

+         """ Main function for R2spec.

          This is the method which actually runs R2spec and generate the

          spec file according to the argument given.

          """
@@ -309,7 +309,7 @@ 

      def __check_build_output(self):

          """ Handle the output from the build, if it succeeded we stop

          otherwise the parse the error and act accordingly.

-         Return False if the build was successful, retun True otherwise.

+         Return False if the build was successful, return True otherwise.

          """

          specfile = self.spec.get_specfile()

          if self.build.outcode == 0:
@@ -323,7 +323,7 @@ 

              return True

  

      def main(self, args):

-         """ main fonction for R2rpm.

+         """ Main function for R2rpm.

          This is the method which actually runs R2rpm, it generates the

          spec files, cleans its %files section, build it and fill again

          the %files section.
@@ -403,7 +403,7 @@ 

                  self.log.info('%s', err)

                  return 1

              except BuildError as err:

-                 print('An error occured during the build of %s' % self.pack.name)

+                 print('An error occurred during the build of %s' % self.pack.name)

                  self.log.debug('Build ERROR: %s', err)

                  return 1

          if not args.keep_logs:

file modified
+1 -2
@@ -276,7 +276,6 @@ 

          """

          for section in self.config.sections():

              if section == 'repo:%s' % reponame:

-                 """ Not sure why this format is getting filled out..."""

-                 self.url = self.config.get(section, 'url' % (self.name))

+                 self.url = self.config.get(section, 'url')

                  self.source0 = self.config.get(section, 'source')

                  break

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

              stream.close()

              self.log.debug('Spec file written: %s', specfile)

              if verbose:

-                 print('Spec file writen: %s' % specfile)

+                 print('Spec file written: %s' % specfile)

          except IOError as err:

              self.log.info('Cannot write the file %s', specfile)

              self.log.debug('ERROR: %s', err)

rebased onto 8cadd26

2 years ago

1 new commit added

  • Remove unnessary string format.
2 years ago

rebased onto 793668b

2 years ago

Oh boy, I sincerely hope my English has improved since I wrote this program...

Pull-Request has been merged by pingou

2 years ago

Ironically, my last commit message is:

Remove unnessary string format.

so it's probably fine.