Fix importing from stdin

The current stdin patch importing expects two EOFs since the 'for' loop
doesn't start before one EOF is received. As suggested, this patch changes
the 'for' loop with a 'while True' loop.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

diff --git a/stgit/commands/imprt.py b/stgit/commands/imprt.py
index 24c7429c861c53abad6f0051ca43c5578bb46da7..900163967178738908b8fdb24bde2eb060a6de7c 100644 (file)
--- a/stgit/commands/imprt.py
+++ b/stgit/commands/imprt.py
@@ -87,7 +87,10 @@ def __parse_mail(filename = None):
     descr = authname = authemail = authdate = None
 
     # parse the headers
     descr = authname = authemail = authdate = None
 
     # parse the headers

-    for line in f:
+    while True:
+        line = f.readline()
+        if not line:
+            break

         line = line.strip()
         if re.match('from:\s+', line, re.I):
             auth = re.findall('^.*?:\s+(.*)$', line)[0]
         line = line.strip()
         if re.match('from:\s+', line, re.I):
             auth = re.findall('^.*?:\s+(.*)$', line)[0]


@@ -109,7 +112,10 @@ def __parse_mail(filename = None):
         raise CmdException, 'Subject: line not found'
 
     # the rest of the patch description
         raise CmdException, 'Subject: line not found'
 
     # the rest of the patch description

-    for line in f:
+    while True:
+        line = f.readline()
+        if not line:
+            break

         if re.match('---\s*$', line) or re.match('diff -', line) or \
                 re.match('^Index: ', line):
             break
         if re.match('---\s*$', line) or re.match('diff -', line) or \
                 re.match('^Index: ', line):
             break


@@ -134,7 +140,11 @@ def __parse_patch(filename = None):
     authname = authemail = authdate = None
 
     descr = ''
     authname = authemail = authdate = None
 
     descr = ''

-    for line in f:
+    while True:
+        line = f.readline()
+        if not line:
+            break
+

         # the first 'Signed-of-by:' is the author
         if not authname and re.match('signed-off-by:\s+', line, re.I):
             auth = re.findall('^.*?:\s+(.*)$', line)[0]
         # the first 'Signed-of-by:' is the author
         if not authname and re.match('signed-off-by:\s+', line, re.I):
             auth = re.findall('^.*?:\s+(.*)$', line)[0]

diff --git a/stgit/git.py b/stgit/git.py
index 293d4213f1e2e4c03201efffa4b5aedf0adbc410..7ab9aefeb0ef53981c325e61ccae9640ed1a7c67 100644 (file)
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -113,7 +113,10 @@ def get_conflicts():
 
 def _input(cmd, file_desc):
     p = popen2.Popen3(cmd)
 
 def _input(cmd, file_desc):
     p = popen2.Popen3(cmd)

-    for line in file_desc:
+    while True:
+        line = file_desc.readline()
+        if not line:
+            break

         p.tochild.write(line)
     p.tochild.close()
     if p.wait():
         p.tochild.write(line)
     p.tochild.close()
     if p.wait():