summaryrefslogtreecommitdiffstats
path: root/g-ed-it
diff options
context:
space:
mode:
authorMatthieu Gautier <mgautier@fedoraproject.org>2009-04-30 23:16:26 +0200
committerMatthieu Gautier <mgautier@fedoraproject.org>2009-04-30 23:16:26 +0200
commit634bf949864e0185e27538a52505252d2b61962b (patch)
treeaac28958ac9278b159d5e09f5f13e591d070adbf /g-ed-it
parentfe6fa5a4ac78c2f45a92f84afd55faad7b7cbbdc (diff)
downloadg-ed-it-634bf949864e0185e27538a52505252d2b61962b.zip
g-ed-it-634bf949864e0185e27538a52505252d2b61962b.tar.gz
g-ed-it-634bf949864e0185e27538a52505252d2b61962b.tar.xz
Fixing subprocess call
Diffstat (limited to 'g-ed-it')
-rw-r--r--g-ed-it/commitDialog.py10
-rw-r--r--g-ed-it/gitAction.py6
2 files changed, 8 insertions, 8 deletions
diff --git a/g-ed-it/commitDialog.py b/g-ed-it/commitDialog.py
index 683e888..4144b8e 100644
--- a/g-ed-it/commitDialog.py
+++ b/g-ed-it/commitDialog.py
@@ -49,11 +49,11 @@ class CommitDialog (object):
self.cwd = os.path.dirname(fileURI)
if allFile:
self.fileName = None
- templateMsg = subprocess.Popen(["git-status","-s"],stdout=subprocess.PIPE,cwd=self.cwd).communicate()[0]
+# templateMsg = subprocess.Popen(["git-status","-s"],stdout=subprocess.PIPE,cwd=self.cwd).communicate()[0]
else:
self.fileName = os.path.basename(fileURI)
- templateMsg = subprocess.Popen(["git-status","-s",self.fileName],stdout=subprocess.PIPE,cwd=self.cwd).communicate()[0]
- self.commit_text_box.get_buffer().set_text(templateMsg)
+# templateMsg = subprocess.Popen(["git-status","-s",self.fileName],stdout=subprocess.PIPE,cwd=self.cwd).communicate()[0]
+ self.commit_text_box.get_buffer().set_text("")
self.commit_dialog.show()
def on_cancel_button_clicked(self, close_button):
@@ -63,9 +63,9 @@ class CommitDialog (object):
commit_text_buffer = self.commit_text_box.get_buffer()
commit_text = commit_text_buffer.get_text(commit_text_buffer.get_start_iter(),commit_text_buffer.get_end_iter())
if self.fileName :
- subprocess.call(["git-commit","-m'"+commit_text+"'", self.fileName],stdout=subprocess.PIPE,cwd=self.cwd)
+ subprocess.call('git-commit -m "'+commit_text+'" '+self.fileName,stdout=subprocess.PIPE,cwd=self.cwd, shell=True)
else:
- subprocess.call(["git-commit","-m'"+commit_text+"'"],stdout=subprocess.PIPE,cwd=self.cwd)
+ subprocess.call('git-commit -m "'+commit_text+'"',stdout=subprocess.PIPE,cwd=self.cwd, shell=True)
commit_text_buffer.set_text("")
self.commit_dialog.hide()
self.plugin.fast_update_ui()
diff --git a/g-ed-it/gitAction.py b/g-ed-it/gitAction.py
index bf4670d..f25706c 100644
--- a/g-ed-it/gitAction.py
+++ b/g-ed-it/gitAction.py
@@ -45,16 +45,16 @@ class GitAction (object):
def add(self,launcher,fileUriMethod = None):
if fileUriMethod : fileUri = fileUriMethod()
- subprocess.call(["git-add",os.path.basename(fileUri)],stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri))
+ subprocess.call("git-add "+os.path.basename(fileUri),stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri), shell=True)
self.plugin.fast_update_ui()
pass
def diff_head_index(self,launcher, fileUriMethod = None):
if fileUriMethod : fileUri = fileUriMethod()
- subprocess.call(["git-difftool","--tool=meld","--no-prompt","--cached",os.path.basename(fileUri)],stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri))
+ subprocess.call("git-difftool --tool=meld --no-prompt --cached "+os.path.basename(fileUri),stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri), shell=True)
pass
def diff_index_wt(self, launcher, fileUriMethod = None):
if fileUriMethod : fileUri = fileUriMethod()
- subprocess.call(["git-difftool","--tool=meld","--no-prompt",os.path.basename(fileUri)],stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri))
+ subprocess.call("git-difftool --tool=meld --no-prompt "+os.path.basename(fileUri),stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri), shell=True)
pass