[library-web/oscp] Revert "Move extra_tarballs at the end of the conf file"



commit c75e4fe7ebd76578707d0aad01b4fe3735f1de2f
Author: Andrea Veri <averi redhat com>
Date:   Tue Feb 25 15:56:06 2020 +0100

    Revert "Move extra_tarballs at the end of the conf file"
    
    This reverts commit 3388d195c966a10451c947eab6743d6ca066313b.

 lgo/library-web.lgorc | 53 ++++++++++++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 26 deletions(-)
---
diff --git a/lgo/library-web.lgorc b/lgo/library-web.lgorc
index 1d0f2fd..72b2b11 100644
--- a/lgo/library-web.lgorc
+++ b/lgo/library-web.lgorc
@@ -52,31 +52,6 @@ blacklist = ['user-guide', 'gnome-access-guide', 'sabayon', 'gnome-lirc-properti
 
 #nightly_tarballs_location = '/usr/local/www/gnomeweb/nightly-tarballs/'
 
-if False:
-    version_min = '3.8'
-    modules = ['gnome-user-docs', 'gnome-getting-started-docs']
-    blacklist = ['sysadmin-guide']
-    extra_tarballs = []
-    languages = ['en']
-
-mal2html_xsl_filename = '/opt/lgo/data/xslt/mal2html.xsl'
-mal2html_xsl = file(mal2html_xsl_filename).read()
-if '/usr/share/yelp-xsl/xslt/mallard' in mal2html_xsl:
-    atime, mtime = os.stat(mal2html_xsl_filename)[-3:-1]
-    mal2html_xsl = mal2html_xsl.replace('/usr/share/yelp-xsl/xslt/mallard',
-                        '/opt/yelp-xsl/xslt/mallard')
-    file(mal2html_xsl_filename, 'w').write(mal2html_xsl)
-    # keeping the file at the old date is not enough to avoid rebuilds, as
-    # the change gets reverted by git and a later pull gets it in the future
-    # again.
-    import subprocess
-    sp = subprocess.Popen(['git', 'log', '-n1', '--format=format:%ct', 'mal2html.xsl'],
-                    cwd='/opt/lgo/data/xslt/',
-                    stdout=subprocess.PIPE)
-    stdout, stderr = sp.communicate()
-    new_mtime = int(stdout.strip())
-    os.utime(mal2html_xsl_filename, (new_mtime, new_mtime))
-
 extra_tarballs.extend([
         # locally generated release notes
         "file:///data/extra-tarballs/release-notes-2.0.tar.gz",
@@ -116,4 +91,30 @@ extra_tarballs.extend([
         "file:///data/extra-tarballs/release-notes-3.32.tar.gz",
         "file:///data/extra-tarballs/release-notes-3.34.tar.gz",
         "file:///data/extra-tarballs/release-notes-3.36.tar.gz",
-])
\ No newline at end of file
+])
+
+
+if False:
+    version_min = '3.8'
+    modules = ['gnome-user-docs', 'gnome-getting-started-docs']
+    blacklist = ['sysadmin-guide']
+    extra_tarballs = []
+    languages = ['en']
+
+mal2html_xsl_filename = '/opt/lgo/data/xslt/mal2html.xsl'
+mal2html_xsl = file(mal2html_xsl_filename).read()
+if '/usr/share/yelp-xsl/xslt/mallard' in mal2html_xsl:
+    atime, mtime = os.stat(mal2html_xsl_filename)[-3:-1]
+    mal2html_xsl = mal2html_xsl.replace('/usr/share/yelp-xsl/xslt/mallard',
+                        '/opt/yelp-xsl/xslt/mallard')
+    file(mal2html_xsl_filename, 'w').write(mal2html_xsl)
+    # keeping the file at the old date is not enough to avoid rebuilds, as
+    # the change gets reverted by git and a later pull gets it in the future
+    # again.
+    import subprocess
+    sp = subprocess.Popen(['git', 'log', '-n1', '--format=format:%ct', 'mal2html.xsl'],
+                    cwd='/opt/lgo/data/xslt/',
+                    stdout=subprocess.PIPE)
+    stdout, stderr = sp.communicate()
+    new_mtime = int(stdout.strip())
+    os.utime(mal2html_xsl_filename, (new_mtime, new_mtime))


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]