package/pseudo/0001-Fix-mixed-tab-space-indentation.patch

   1 From bf4e5310547603bf36e67dc4cba027963f16508e Mon Sep 17 00:00:00 2001
   2 From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@savoirfairelinux.com>
   3 Date: Fri, 4 Nov 2016 11:53:48 -0400
   4 Subject: [PATCH 1/3] Fix mixed tab/space indentation
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=utf-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 CC="cc  -pipe -std=gnu99 -Wall -W -Wextra -fPIC -D_LARGEFILE64_SOURCE -D_ATFILE_SOURCE  -DPSEUDO_PREFIX='"/usr/local"' -DPSEUDO_SUFFIX='""' -DPSEUDO_BINDIR='"bin"' -DPSEUDO_LIBDIR='"lib64"' -DPSEUDO_LOCALSTATEDIR='"var/pseudo"' -DPSEUDO_VERSION='"1.8.1"' -DUSE_MEMORY_DB  -DPSEUDO_PASSWD_FALLBACK='""'   -DPSEUDO_XATTR_SUPPORT       -O2 -g " ./makewrappers "xattr=true"
  10   File "./makewrappers", line 327
  11     return """/* This function is not called if pseudo is configured --enable-force-async */
  12                                                                                            ^
  13 TabError: inconsistent use of tabs and spaces in indentation
  14
  15 Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
  16 ---
  17  makewrappers | 26 +++++++++++++-------------
  18  1 file changed, 13 insertions(+), 13 deletions(-)
  19
  20 diff --git a/makewrappers b/makewrappers
  21 index e9191ed..303e2cc 100755
  22 --- a/makewrappers
  23 +++ b/makewrappers
  24 @@ -324,7 +324,7 @@ class Function:
  25
  26      def maybe_async_skip(self):
  27          if self.async_skip:
  28 -           return """/* This function is not called if pseudo is configured --enable-force-async */
  29 +            return """/* This function is not called if pseudo is configured --enable-force-async */
  30  #ifdef PSEUDO_FORCE_ASYNC
  31         if (!pseudo_allow_fsync) {
  32                 PROFILE_DONE;
  33 @@ -333,7 +333,7 @@ class Function:
  34  #endif
  35  """ % self.async_skip
  36          else:
  37 -           return ""
  38 +            return ""
  39
  40      def comment(self):
  41          """declare self (in a comment)"""
  42 @@ -393,11 +393,11 @@ class Function:
  43
  44      def rc_format(self):
  45          """the format string to use for the return value"""
  46 -       return typedata.get(self.type, { 'format': '[%s]', 'value': '"' + self.type + '"' })['format']
  47 +        return typedata.get(self.type, { 'format': '[%s]', 'value': '"' + self.type + '"' })['format']
  48
  49      def rc_value(self):
  50          """the value to pass for the format string for the return value"""
  51 -       return typedata.get(self.type, { 'format': '[%s]', 'value': '"' + self.type + '"' })['value']
  52 +        return typedata.get(self.type, { 'format': '[%s]', 'value': '"' + self.type + '"' })['value']
  53
  54      def rc_decl(self):
  55          """declare rc (if needed)"""
  56 @@ -456,7 +456,7 @@ additional ports to include.
  57          self.name = port
  58          self.subports = []
  59          self.preports = []
  60 -       print port
  61 +        print port
  62
  63          if os.path.exists(self.portfile("pseudo_wrappers.c")):
  64              self.wrappers = self.portfile("pseudo_wrappers.c")
  65 @@ -522,11 +522,11 @@ additional ports to include.
  66          return '#define PSEUDO_PORT_%s 1' % string.upper(self.name).replace('/', '_')
  67
  68      def portdeps(self):
  69 -       deps = []
  70 -       if self.wrappers:
  71 -           deps.append(self.wrappers)
  72 -       if self.portdef_file:
  73 -           deps.append(self.portdef_file)
  74 +        deps = []
  75 +        if self.wrappers:
  76 +            deps.append(self.wrappers)
  77 +        if self.portdef_file:
  78 +            deps.append(self.portdef_file)
  79          if deps:
  80              return 'pseudo_wrappers.o: %s' % ' '.join(deps)
  81          else:
  82 @@ -590,7 +590,7 @@ def main(argv):
  83
  84      for arg in argv:
  85          name, value = arg.split('=')
  86 -       os.environ["port_" + name] = value
  87 +        os.environ["port_" + name] = value
  88
  89      # error checking helpfully provided by the exception handler
  90      copyright_file = open('guts/COPYRIGHT')
  91 @@ -599,9 +599,9 @@ def main(argv):
  92
  93      for path in glob.glob('templates/*'):
  94          try:
  95 -           print "Considering template: " + path
  96 +            print "Considering template: " + path
  97              source = TemplateFile(path)
  98 -           if source.name.endswith('.c') or source.name.endswith('.h'):
  99 +            if source.name.endswith('.c') or source.name.endswith('.h'):
 100                  source.emit('copyright')
 101              source.emit('header')
 102              sources.append(source)
 103 --
 104 2.10.1
 105