From: Richard Heck <rgheck@comcast.net>
Date: Sat, 5 Feb 2011 14:04:28 +0000 (+0000)
Subject: Revert part of r37496. This was wrong.
X-Git-Tag: 2.0.0~866
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=1aad2779e462ee7d419eca04ad119ac2134e9e65;p=features.git

Revert part of r37496. This was wrong.

Probalby we have a better "isLyXFile()" routine for use also in gather_files().



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37504 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/tools/lyxpak.py b/development/tools/lyxpak.py
index b8e6a59e6e..983736373d 100755
--- a/development/tools/lyxpak.py
+++ b/development/tools/lyxpak.py
@@ -24,7 +24,7 @@ from sets import Set
 lyx2lyx = None
 
 # Pre-compiled regular expressions.
-re_extn = re.compile("\.[^.]*$")
+re_lyxfile = re.compile("\.lyx$")
 re_input = re.compile(r'^(.*)\\(input|include){(\s*)(\S+)(\s*)}.*$')
 re_package = re.compile(r'^(.*)\\(usepackage){(\s*)(\S+)(\s*)}.*$')
 re_class = re.compile(r'^(\\)(textclass)(\s+)(\S+)$')
@@ -71,7 +71,7 @@ def abspath(name):
 def gather_files(curfile, incfiles):
     " Recursively gather files."
     curdir = os.path.dirname(abspath(curfile))
-    is_lyxfile = re_extn.search(curfile)
+    is_lyxfile = re_lyxfile.search(curfile)
     if is_lyxfile:
         lyx2lyx_cmd = 'python "%s" "%s"' % (lyx2lyx, curfile)
         l2l_status, l2l_stdout = run_cmd(lyx2lyx_cmd)
@@ -185,7 +185,7 @@ def main(argv):
 
     if archiver == "tar":
         ar_cmd = "tar cf"
-        ar_name = re_extn.sub(".tar", abspath(lyxfile))
+        ar_name = re_lyxfile.sub(".tar", abspath(lyxfile))
         # Archive will be compressed if either gzip or bzip2 are available
         compress, full_path = find_exe(["gzip", "bzip2"], extlist, path)
         if compress == "gzip":
@@ -194,7 +194,7 @@ def main(argv):
             ext = ".bz2"
     elif archiver == "zip":
         ar_cmd = "zip"
-        ar_name = re_extn.sub(".zip", abspath(lyxfile))
+        ar_name = re_lyxfile.sub(".zip", abspath(lyxfile))
         compress = None
     else:
         error("Unable to find either tar or zip.")