Attachment 702286 Details for Bug 915264 – Handle filenames w/ spaces in SCM/git when setting timestamps

[patch] Handle filenames w/ spaces in SCM/git when setting timestamps

0001-Handle-filenames-w-spaces-in-SCM-git-when-setting-ti.patch (text/plain), 1.41 KB, created by Marko Myllynen on 2013-02-25 10:39:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marko Myllynen

Created: 2013-02-25 10:39:00 UTC

Size: 1.41 KB

patch

obsolete

>From f704e4f065561078a955b706b17a110e86f74916 Mon Sep 17 00:00:00 2001
>From: Marko Myllynen <myllynen@redhat.com>
>Date: Mon, 25 Feb 2013 12:37:12 +0200
>Subject: [PATCH] Handle filenames w/ spaces in SCM/git when setting timestamps
>
>---
> py/mockbuild/scm.py |    7 +++----
> 1 files changed, 3 insertions(+), 4 deletions(-)
>
>diff --git a/py/mockbuild/scm.py b/py/mockbuild/scm.py
>index 15b3c26..1ad1024 100644
>--- a/py/mockbuild/scm.py
>+++ b/py/mockbuild/scm.py
>@@ -94,12 +94,11 @@ class scmWorker(object):
>         dir = os.getcwd()
>         self.log.debug("Adjusting timestamps in " + self.src_dir)
>         os.chdir(self.src_dir)
>-        proc = subprocess.Popen(['git', 'ls-files'], shell=False, stdout=subprocess.PIPE)
>-        for f in proc.communicate()[0].split():
>+        proc = subprocess.Popen(['git', 'ls-files', '-z'], shell=False, stdout=subprocess.PIPE)
>+        for f in proc.communicate()[0].split('\0')[:-1]:
>             rev = subprocess.Popen(['git', 'rev-list', 'HEAD', f], shell=False, stdout=subprocess.PIPE).stdout.readlines()[0].rstrip('\n')
>             ts = subprocess.Popen(['git', 'show', '--pretty=format:%ai', '--abbrev-commit', rev, f], shell=False, stdout=subprocess.PIPE).stdout.readlines()[0].rstrip('\n')
>-            cmd = "touch -d \'" + ts + "\' " + f
>-            os.system(cmd)
>+            subprocess.Popen(['touch', '-d', ts, f], shell=False)
>         os.chdir(dir)
> 
>     decorate(traceLog())
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 915264: 702286