Merge pull request #3705 from branfosj/strip

correctly strip extension from filename in extract_cmd and back_up_file functions

Author: boegel

easybuild/tools/filetools.py

@@ -1320,7 +1320,7 @@ def extract_cmd(filepath, overwrite=False):
     """
     filename = os.path.basename(filepath)
     ext = find_extension(filename)
-    target = filename.rstrip(ext)
+    target = filename[:-len(ext)]
 
     cmd_tmpl = EXTRACT_CMDS[ext.lower()]
     if overwrite:
@@ -2005,8 +2005,8 @@ def back_up_file(src_file, backup_extension='bak', hidden=False, strip_fn=None):
         fn_suffix = '.%s' % backup_extension
 
     src_dir, src_fn = os.path.split(src_file)
-    if strip_fn:
-        src_fn = src_fn.rstrip(strip_fn)
+    if strip_fn and src_fn.endswith(strip_fn):
+        src_fn = src_fn[:-len(strip_fn)]
 
     backup_fp = find_backup_name_candidate(os.path.join(src_dir, fn_prefix + src_fn + fn_suffix))
 

test/framework/filetools.py

@@ -97,6 +97,10 @@ def test_extract_cmd(self):
             ('test.iso', "7z x test.iso"),
             ('test.tar.Z', "tar xzf test.tar.Z"),
             ('test.foo.bar.sh', "cp -a test.foo.bar.sh ."),
+            # check whether extension is stripped correct to determine name of target file
+            # cfr. https://github.com/easybuilders/easybuild-framework/pull/3705
+            ('testbz2.bz2', "bunzip2 -c testbz2.bz2 > testbz2"),
+            ('testgz.gz', "gunzip -c testgz.gz > testgz"),
         ]
         for (fn, expected_cmd) in tests:
             cmd = ft.extract_cmd(fn)
@@ -926,14 +930,18 @@ def test_back_up_file(self):
         self.assertEqual(ft.read_file(fp), new_txt)
 
         # check whether strip_fn works as expected
-        fp2 = fp + '.lua'
+        fp2 = fp + 'a.lua'
         ft.copy_file(fp, fp2)
         res = ft.back_up_file(fp2)
         self.assertTrue(fp2.endswith('.lua'))
         self.assertTrue('.lua' in os.path.basename(res))
 
         res = ft.back_up_file(fp2, strip_fn='.lua')
         self.assertFalse('.lua' in os.path.basename(res))
+        # strip_fn should not remove the first a in 'a.lua'
+        expected = os.path.basename(fp) + 'a.bak_'
+        res_fn = os.path.basename(res)
+        self.assertTrue(res_fn.startswith(expected), "'%s' should start with with '%s'" % (res_fn, expected))
 
     def test_move_logs(self):
         """Test move_logs function."""