Release 3.53.5

- remove trailing spaces
- fix bash-completion location

6 files changed, 19 insertions, 19 deletions

diff --git a/BuildManager/fileutil.py b/BuildManager/fileutil.py
index 05126da..d045321 100644
--- a/BuildManager/fileutil.py
+++ b/BuildManager/fileutil.py
@@ -28,20 +28,20 @@ def _copy_file_contents (src, dst, buffer_size=16*1024):
         except os.error as e:
             (errno, errstr) = e.args
             raise Error("could not open %s: %s" % (src, errstr))
-        
+
         try:
             fdst = open(dst, 'wb')
         except os.error as e:
             (errno, errstr) = e.args
             raise Error("could not create %s: %s" % (dst, errstr))
-        
+
         while 1:
             try:
                 buf = fsrc.read(buffer_size)
             except os.error as e:
                 (errno, errstr) = e.args
                 raise Error("could not read from %s: %s" % (src, errstr))
-            
+
             if not buf:
                 break
 
@@ -50,7 +50,7 @@ def _copy_file_contents (src, dst, buffer_size=16*1024):
             except os.error as e:
                 (errno, errstr) = e.args
                 raise Error("could not write to %s: %s" % (dst, errstr))
-            
+
     finally:
         if fdst:
             fdst.close()
@@ -101,7 +101,7 @@ def copy_file (src, dst, preserve_mode=1, preserve_times=1, link=None,
         logger.info("%s %s to %s" % (action, src, dir))
     else:
         logger.info("%s %s to %s" % (action, src, dst))
-            
+
     if dryrun:
         return (dst, 1)
 
@@ -138,7 +138,7 @@ def move_file (src, dst, dryrun=False):
     """
     from os.path import exists, isfile, isdir, basename, dirname
     import errno
-    
+
     logger.info("moving %s to %s" % (src, dst))
 
     if dryrun:
diff --git a/BuildManager/package.py b/BuildManager/package.py
index 1c88bd3..d324453 100644
--- a/BuildManager/package.py
+++ b/BuildManager/package.py
@@ -66,7 +66,7 @@ class _package:
         if rc: return rc
         return rpmVersionCompare(self.epoch, self.version, self.release,
                                  pkg.epoch, pkg.version, pkg.release)
-        
+
     def _expand_log(self):
         substdict = {"builddir":self.builddir,
                      "name":self.name,
@@ -94,7 +94,7 @@ class _package_spec(_package):
             else:
                 ret.append(s[start:end+1])
         return "".join(ret)
-    
+
     def _init(self):
         self.spec = self.absfile
         self.builddir = os.path.dirname(os.path.dirname(self.absfile))
@@ -170,7 +170,7 @@ class _package_rpm(_package):
             if self.builddir:
                 self._expand_log()
                 return self._install_srpm()
-    
+
     def _builddir_create(self, unpackdir):
         unpackdir = os.path.abspath(unpackdir)
         builddir = "%s/%s-%s-%s-topdir" % (unpackdir, self.name, self.version, self.release)
@@ -179,7 +179,7 @@ class _package_rpm(_package):
             raise BuildManagerPackageError("error creating builddir at %s" % builddir)
         else:
             return builddir
-    
+
     def _install_srpm(self):
         cmd = "rpm -i --define '_topdir %s' %s &> %s"%(self.builddir,self.file,self.log)
         status, output = subprocess.getstatusoutput(cmd)
@@ -217,7 +217,7 @@ class PackageList(UserList):
                and mypkg <= pkg:
                 return 1
         return 0
-    
+
     def has_eq(self, pkg):
         for mypkg in self.data:
             if mypkg.name == pkg.name \
@@ -225,7 +225,7 @@ class PackageList(UserList):
                and mypkg == pkg:
                 return 1
         return 0
-    
+
     def has_ge(self, pkg):
         for mypkg in self.data:
             if mypkg.name == pkg.name \
diff --git a/PKG-INFO b/PKG-INFO
index e35af76..f79eb9f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: bm
-Version: 3.4
+Version: 3.5
 Summary: BuildManager - rpm package building helper
 Home-page: http://gitweb.mageia.org/software/build-system/bm/
 Author: Gustavo Niemeyer, Papoteur
@@ -11,5 +11,5 @@ Description: BuildManager, or bm, is a program that wraps and extends rpm while
         controling logs, rpm and srpm moving, filtering the list of files, ignoring
         given packages, completely cleaning the build directories, and many other
         features.
-        
+
 Platform: UNKNOWN
diff --git a/bm b/bm
index 9b8ca66..eb41217 100644
--- a/bm
+++ b/bm
@@ -8,7 +8,7 @@ import sys, os
 import pwd
 
 AUTHOR  = "Gustavo Niemeyer <niemeyer@conectiva.com>, papoteur <papoteur@mageialinux-online.org>"
-VERSION = "3.4"
+VERSION = "3.5"
 
 def passtrough(option, opt, val, parser):
     opts = parser.values
@@ -50,7 +50,7 @@ def parse_options():
     parser.add_option("-o", dest="options", action="append",
                       metavar="OPT", default=[],
                       help="pass given parameters directly to rpm")
-     parser.add_option("--unpack-dir", metavar="DIR", default=workDir,
+    parser.add_option("--unpack-dir", metavar="DIR", default=workDir,
                       help="specify directory where to unpack file(s)")
     parser.add_option("--build-log", metavar="FILE",
                       help="specify where to put the build log for each package")
@@ -174,7 +174,7 @@ def parse_options():
         if error:
             raise Error("value of --%s must be a directory" \
                          % attr.replace("_", "-"))
-     
+
     old_ignore = opts.ignore
     opts.ignore = []
     for ignore in old_ignore:
diff --git a/bmclean b/bmclean
index cc87201..cf4b200 100644
--- a/bmclean
+++ b/bmclean
@@ -8,7 +8,7 @@ import sys, os
 import pwd
 
 AUTHOR  = "Gustavo Niemeyer <niemeyer@conectiva.com>, papoteur <papoteur@mageialinux-online.org>"
-VERSION = "3.4"
+VERSION = "3.5"
 
 def parse_options():
     parser = OptionParser("%prog [OPTIONS] <srpm files>",
diff --git a/setup.py b/setup.py
index 1a8319b..31470ca 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ if not m:
     sys.exit("error: can't find VERSION")
 VERSION = m.group(1)
 
-bash_dir = "/etc/bash_completion.d"
+bash_dir = "share/bash-completion/completions"
 man_dir = "share/man"
 
 setup(name="bm",