Mercurial > gub

changeset 3599:8e12bd09c5e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Handle '/' in branch names.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Tue, 10 Jul 2007 14:53:32 +0200
parents 56c37402a9a1
children 79f70d0b5a49
files gub/gubb.py
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gub/gubb.py	Tue Jul 10 14:21:54 2007 +0200
+++ b/gub/gubb.py	Tue Jul 10 14:53:32 2007 +0200
@@ -46,7 +46,6 @@
 
     def create_tarball (self):
         cmd = 'tar -C %(install_root)s/%(packaging_suffix_dir)s --ignore-failed --exclude="*~" -zcf %(split_ball)s '
-
         path = os.path.normpath (self.expand ('%(install_root)s'))
         globs  = []
         for f in self._file_specs:
@@ -187,10 +186,11 @@
 
     @subst_method
     def ball_suffix (self):
+        # FIXME: use repository.version ()
         b = '-%(version)s'
         if self.vc_repository and self.vc_repository.is_tracking ():
             try:
-                b = '-' + self.vc_repository.branch
+                b = '-' + self.vc_repository.branch.replace ('/', '-')
             except AttributeError:
                 pass
         return b
@@ -200,17 +200,18 @@
         b = ''
         if self.vc_repository and self.vc_repository.is_tracking ():
             try:
-                b = self.vc_repository.branch
+                b = self.vc_repository.branch.replace ('/', '-')
             except AttributeError:
                 pass
         return b
     
     @subst_method
     def vc_branch_suffix (self):
+        # FIXME: use repository.version ()
         b = ''
         if self.vc_repository and self.vc_repository.is_tracking ():
             try:
-                b = '-' + self.vc_repository.branch
+                b = '-' + self.vc_repository.branch.replace ('/', '-')
             except AttributeError:
                 pass
         return b