[unoconv] also use opt. names with two dashes

David Tardon dtardon at fedoraproject.org
Mon Mar 26 15:40:38 UTC 2012


commit 3689764536765611edf2b77ea986d8762c5cf2fe
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Mar 26 17:40:20 2012 +0200

    also use opt. names with two dashes

 unoconv-nocrashreport.patch |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/unoconv-nocrashreport.patch b/unoconv-nocrashreport.patch
index f41aada..9ddb190 100644
--- a/unoconv-nocrashreport.patch
+++ b/unoconv-nocrashreport.patch
@@ -8,7 +8,7 @@ diff -u unoconv-0.4.orig/unoconv unoconv-0.4/unoconv
              info(3, "Launching our own listener using %s." % oobin)
              try:
 -                ooproc = subprocess.Popen([oobin, "-headless", "-invisible", "-nocrashreport", "-nodefault", "-nofirststartwizard", "-nologo", "-norestore", "-accept=%s" % op.connection])
-+                ooproc = subprocess.Popen([oobin, "-headless", "-invisible", "-nodefault", "-nofirststartwizard", "-nologo", "-norestore", "-accept=%s" % op.connection])
++                ooproc = subprocess.Popen([oobin, "--headless", "--invisible", "--nodefault", "--nofirststartwizard", "--nologo", "--norestore", "--accept=%s" % op.connection])
                  info(2, 'OpenOffice listener successfully started. (pid=%s)' % ooproc.pid)
  
                  ### Try connection to it for op.timeout seconds (flakky OpenOffice)
@@ -17,7 +17,7 @@ diff -u unoconv-0.4.orig/unoconv unoconv-0.4/unoconv
          info(1, "Start listener on %s:%s" % (op.server, op.port))
          try:
 -            subprocess.call([oobin, "-headless", "-invisible", "-nocrashreport", "-nodefault", "-nologo", "-nofirststartwizard", "-norestore", "-accept=%s" % op.connection])
-+            subprocess.call([oobin, "-headless", "-invisible", "-nodefault", "-nologo", "-nofirststartwizard", "-norestore", "-accept=%s" % op.connection])
++            subprocess.call([oobin, "--headless", "--invisible", "--nodefault", "--nologo", "--nofirststartwizard", "--norestore", "--accept=%s" % op.connection])
          except Exception, e:
              error("Launch of %s failed.\n%s" % (oobin, e))
          else:
@@ -26,7 +26,7 @@ diff -u unoconv-0.4.orig/unoconv unoconv-0.4/unoconv
          if convertor.desktop.getCurrentFrame():
              try:
 -                subprocess.Popen([oobin, "-headless", "-invisible", "-nocrashreport", "-nodefault", "-nofirststartwizard", "-nologo", "-norestore", "-unaccept=%s" % op.connection])
-+                subprocess.Popen([oobin, "-headless", "-invisible", "-nodefault", "-nofirststartwizard", "-nologo", "-norestore", "-unaccept=%s" % op.connection])
++                subprocess.Popen([oobin, "--headless", "--invisible", "--nodefault", "--nofirststartwizard", "--nologo", "--norestore", "--unaccept=%s" % op.connection])
                  info(2, 'OpenOffice listener successfully disabled.')
                  ooproc.wait()
              except Exception, e:


More information about the scm-commits mailing list