it's the little things that mean a lot

diff --git a/kernel_inpbuilder.py b/kernel_inpbuilder.py
index c2fd6327f15552e68bce2587d2d57fee6bab57e3..76d85e619f0a5432be4655240571645fcdb23fe1 100644 (file)
--- a/kernel_inpbuilder.py
+++ b/kernel_inpbuilder.py
@@ -204,7 +204,7 @@ def build_kernel(revision, parallel_jobs='auto', distcc=False):
 
     cmd = [MAKE_KPKG, '-j', '%s' %(parallel_jobs), '--arch',
             '%s' %(BUILD_ARCH), '--rootcmd', 'fakeroot', '--append_to_version',
-            '~%s' %(revision), '--initrd', 'kernel_debug',
+            '%s' %(revision), '--initrd', 'kernel_debug',
             'kernel_image', 'kernel_source', 'kernel_headers', 'modules']
 
     logger.info('start compile process')
@@ -246,14 +246,14 @@ def add_local_version_to_config(kernel_build_revision):
         )
     kernel_config = read_file(KERNEL_CONFIG_PATH)
     # don't put the branch names into the packages names
-    if GIT_BRANCH_NAME[7:] == 'master-':
-        flavour = GIT_BRANCH_NAME[:7]
-    elif GIT_BRANCH_NAME[8:] == 'develop-':
-        flavour = GIT_BRANCH_NAME[:8]
-    elif GIT_BRANCH_NAME[8:] == 'release-':
-        flavour = GIT_BRANCH_NAME[:8]
-    elif GIT_BRANCH_NAME[7:] == 'hotfix-':
-        flavour = GIT_BRANCH_NAME[:7]
+    if GIT_BRANCH_NAME[:7] == 'master-':
+        flavour = GIT_BRANCH_NAME[7:]
+    elif GIT_BRANCH_NAME[:8] == 'develop-':
+        flavour = GIT_BRANCH_NAME[8:]
+    elif GIT_BRANCH_NAME[:8] == 'release-':
+        flavour = GIT_BRANCH_NAME[8:]
+    elif GIT_BRANCH_NAME[:7] == 'hotfix-':
+        flavour = GIT_BRANCH_NAME[7:]
     else: 
         logger.error('GIT_BRANCH_NAME is %s' % GIT_BRANCH_NAME)
         flavour = 'none'