Merge remote-tracking branch 'spalax/paternal/libdirs'

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 9e2eb0b1a98130bbfc2d7cbb7fd548eda46ad75c..7c55764befa0f5d325e01f302ca4a8a036c82256 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -5,6 +5,7 @@ package IkiWiki;
 use warnings;
 use strict;
 use Encode;
 use warnings;
 use strict;
 use Encode;

+use Fcntl q{:flock};

 use URI::Escape q{uri_escape_utf8};
 use POSIX ();
 use Storable;
 use URI::Escape q{uri_escape_utf8};
 use POSIX ();
 use Storable;


@@ -274,7 +275,7 @@ sub getsetup () {
        html5 => {
                type => "boolean",
                default => 0,
        html5 => {
                type => "boolean",
                default => 0,

-               description => "generate HTML5?",
+               description => "use elements new in HTML5 like <section>?",

                advanced => 0,
                safe => 1,
                rebuild => 1,
                advanced => 0,
                safe => 1,
                rebuild => 1,


@@ -549,6 +550,13 @@ sub getsetup () {
                safe => 0,
                rebuild => 0,
        },
                safe => 0,
                rebuild => 0,
        },

+       responsive_layout => {
+               type => "boolean",
+               default => 1,
+               description => "theme has a responsive layout? (mobile-optimized)",
+               safe => 1,
+               rebuild => 1,
+       },

 }
 
 sub getlibdirs () {
 }
 
 sub getlibdirs () {


@@ -1822,8 +1830,11 @@ sub lockwiki () {
        }
        open($wikilock, '>', "$config{wikistatedir}/lockfile") ||
                error ("cannot write to $config{wikistatedir}/lockfile: $!");
        }
        open($wikilock, '>', "$config{wikistatedir}/lockfile") ||
                error ("cannot write to $config{wikistatedir}/lockfile: $!");

-       if (! flock($wikilock, 2)) { # LOCK_EX
-               error("failed to get lock");
+       if (! flock($wikilock, LOCK_EX | LOCK_NB)) {
+               debug("failed to get lock; waiting...");
+               if (! flock($wikilock, LOCK_EX)) {
+                       error("failed to get lock");
+               }

        }
        return 1;
 }
        }
        return 1;
 }