fix use ordering

The recent setup revamp exposed some latent bugs in use/package ordering
that caused some symbols to not the exported into the correct scope.

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 2a847eb1733ba275c31d4880d9f356fd847ec80a..6770f6feb7081f4462be9f30d6e0db87195e29a5 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -1,5 +1,7 @@
 #!/usr/bin/perl
 
 #!/usr/bin/perl
 

+package IkiWiki;
+

 use warnings;
 use strict;
 use IkiWiki;
 use warnings;
 use strict;
 use IkiWiki;


@@ -7,8 +9,6 @@ use IkiWiki::UserInfo;
 use open qw{:utf8 :std};
 use Encode;
 
 use open qw{:utf8 :std};
 use Encode;
 

-package IkiWiki;
-

 sub printheader ($) { #{{{
        my $session=shift;
        
 sub printheader ($) { #{{{
        my $session=shift;
        

diff --git a/IkiWiki/Rcs/Stub.pm b/IkiWiki/Rcs/Stub.pm
index a460f29a2ee34f9580ba9ad5a81c3b2159a32acf..6b69e65dcdbc2e92ff5e8e725830f4626c6c6a4d 100644 (file)
--- a/IkiWiki/Rcs/Stub.pm
+++ b/IkiWiki/Rcs/Stub.pm
@@ -1,12 +1,12 @@
 #!/usr/bin/perl
 # Stubs for no revision control.
 
 #!/usr/bin/perl
 # Stubs for no revision control.
 

+package IkiWiki;
+

 use warnings;
 use strict;
 use IkiWiki;
 
 use warnings;
 use strict;
 use IkiWiki;
 

-package IkiWiki;
-

 sub rcs_update () {
        # Update working directory to current version.
        # (May be more complex for distributed RCS.)
 sub rcs_update () {
        # Update working directory to current version.
        # (May be more complex for distributed RCS.)

diff --git a/IkiWiki/Rcs/bzr.pm b/IkiWiki/Rcs/bzr.pm
index af311fab8aab4411d8767d0f66133d413c76d516..0dc456de2c1fc652b48491f1584e17e0341f5b59 100644 (file)
--- a/IkiWiki/Rcs/bzr.pm
+++ b/IkiWiki/Rcs/bzr.pm
@@ -1,13 +1,13 @@
 #!/usr/bin/perl
 
 #!/usr/bin/perl
 

+package IkiWiki;
+

 use warnings;
 use strict;
 use IkiWiki;
 use Encode;
 use open qw{:utf8 :std};
 
 use warnings;
 use strict;
 use IkiWiki;
 use Encode;
 use open qw{:utf8 :std};
 

-package IkiWiki;
-

 sub bzr_log ($) { #{{{
        my $out = shift;
        my @infos = ();
 sub bzr_log ($) { #{{{
        my $out = shift;
        my @infos = ();

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index 0369008878cabae640bb4cb771705ae2e3e6d0dd..425536f62bfb37a567efb9ecc269d1b3e32ae7c1 100644 (file)
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -1,13 +1,13 @@
 #!/usr/bin/perl
 
 #!/usr/bin/perl
 

+package IkiWiki;
+

 use warnings;
 use strict;
 use IkiWiki;
 use Encode;
 use open qw{:utf8 :std};
 
 use warnings;
 use strict;
 use IkiWiki;
 use Encode;
 use open qw{:utf8 :std};
 

-package IkiWiki;
-

 my $sha1_pattern     = qr/[0-9a-fA-F]{40}/; # pattern to validate Git sha1sums
 my $dummy_commit_msg = 'dummy commit';      # message to skip in recent changes
 
 my $sha1_pattern     = qr/[0-9a-fA-F]{40}/; # pattern to validate Git sha1sums
 my $dummy_commit_msg = 'dummy commit';      # message to skip in recent changes
 

diff --git a/IkiWiki/Rcs/mercurial.pm b/IkiWiki/Rcs/mercurial.pm
index a042f4a455204f3d49e5e0c7298ed569736eb85c..bfe6ba49c13edc088b270faee364d94a2dbd7903 100644 (file)
--- a/IkiWiki/Rcs/mercurial.pm
+++ b/IkiWiki/Rcs/mercurial.pm
@@ -1,13 +1,13 @@
 #!/usr/bin/perl
 
 #!/usr/bin/perl
 

+package IkiWiki;
+

 use warnings;
 use strict;
 use IkiWiki;
 use Encode;
 use open qw{:utf8 :std};
 
 use warnings;
 use strict;
 use IkiWiki;
 use Encode;
 use open qw{:utf8 :std};
 

-package IkiWiki;
-

 sub mercurial_log($) {
        my $out = shift;
        my @infos;
 sub mercurial_log($) {
        my $out = shift;
        my @infos;

diff --git a/IkiWiki/Rcs/monotone.pm b/IkiWiki/Rcs/monotone.pm
index 6931fd36b4159a32bf97ad417a3c549872fc9716..ce4a2a3ed4d3b10d89b436818b29145b7cd743ff 100644 (file)
--- a/IkiWiki/Rcs/monotone.pm
+++ b/IkiWiki/Rcs/monotone.pm
@@ -1,4 +1,7 @@
 #!/usr/bin/perl
 #!/usr/bin/perl

+
+package IkiWiki;
+

 use warnings;
 use strict;
 use IkiWiki;
 use warnings;
 use strict;
 use IkiWiki;


@@ -6,8 +9,6 @@ use Monotone;
 use Date::Parse qw(str2time);
 use Date::Format qw(time2str);
 
 use Date::Parse qw(str2time);
 use Date::Format qw(time2str);
 

-package IkiWiki;
-

 my $sha1_pattern = qr/[0-9a-fA-F]{40}/; # pattern to validate sha1sums
 
 sub check_config() { #{{{
 my $sha1_pattern = qr/[0-9a-fA-F]{40}/; # pattern to validate sha1sums
 
 sub check_config() { #{{{

diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm
index ea193e08f33418ab7be3f91819fade367dda7092..6a822e896cd79951d3d0a4fdc1dd3e4a4e9c3b9e 100644 (file)
--- a/IkiWiki/Rcs/svn.pm
+++ b/IkiWiki/Rcs/svn.pm
@@ -1,12 +1,12 @@
 #!/usr/bin/perl
 
 #!/usr/bin/perl
 

+package IkiWiki::Rcs::svn;
+

 use warnings;
 use strict;
 use IkiWiki;
 use POSIX qw(setlocale LC_CTYPE);
 
 use warnings;
 use strict;
 use IkiWiki;
 use POSIX qw(setlocale LC_CTYPE);
 

-package IkiWiki::Rcs::svn;
-

 sub import { #{{{
        if (exists $IkiWiki::config{svnpath}) {
                # code depends on the path not having extraneous slashes
 sub import { #{{{
        if (exists $IkiWiki::config{svnpath}) {
                # code depends on the path not having extraneous slashes

diff --git a/IkiWiki/Rcs/tla.pm b/IkiWiki/Rcs/tla.pm
index 47579c15b756252e1054efe77901c22568ce7c4e..e7fed9ad8ce9c838da52039e6a117b5b4f6c2c73 100644 (file)
--- a/IkiWiki/Rcs/tla.pm
+++ b/IkiWiki/Rcs/tla.pm
@@ -1,11 +1,11 @@
 #!/usr/bin/perl
 
 #!/usr/bin/perl
 

+package IkiWiki;
+

 use warnings;
 use strict;
 use IkiWiki;
 
 use warnings;
 use strict;
 use IkiWiki;
 

-package IkiWiki;
-

 sub quiet_system (@) {
        # See Debian bug #385939.
        open (SAVEOUT, ">&STDOUT");
 sub quiet_system (@) {
        # See Debian bug #385939.
        open (SAVEOUT, ">&STDOUT");

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index a37264cd752475e57b454aedbcdaa6504a88689c..2b76efc16b92bd471429f660df73d4d2f24b05e9 100644 (file)
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -8,9 +8,11 @@
 # IkiWiki::Setup::$raw_setup, to pass it back to this module.
 
 package IkiWiki::Setup;
 # IkiWiki::Setup::$raw_setup, to pass it back to this module.
 
 package IkiWiki::Setup;

+

 use warnings;
 use strict;
 use IkiWiki;
 use warnings;
 use strict;
 use IkiWiki;

+use IkiWiki::Wrapper;

 use open qw{:utf8 :std};
 
 our $raw_setup;
 use open qw{:utf8 :std};
 
 our $raw_setup;

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 693c4fe60a7d3a3d9f4944aac8c778d2d1a71f2e..f67c3829b71d437dc73ed7477196d9323247ece4 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -3,12 +3,10 @@
 # Parameters to import should be all the standard ikiwiki config stuff,
 # plus an array of wrappers to set up.
 
 # Parameters to import should be all the standard ikiwiki config stuff,
 # plus an array of wrappers to set up.
 

+package IkiWiki::Setup::Standard;
+

 use warnings;
 use strict;
 use warnings;
 use strict;

-use IkiWiki::Wrapper;
-use IkiWiki::Render;
-
-package IkiWiki::Setup::Standard;

 
 sub import {
        $IkiWiki::Setup::raw_setup=$_[1];
 
 sub import {
        $IkiWiki::Setup::raw_setup=$_[1];

diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm
index a0b1327b44fdeac0b3b37e46e863de95a0ad360e..109a6cb5f24eff1c54e3e9ac722babb12a3753cb 100644 (file)
--- a/IkiWiki/UserInfo.pm
+++ b/IkiWiki/UserInfo.pm
@@ -1,12 +1,12 @@
 #!/usr/bin/perl
 
 #!/usr/bin/perl
 

+package IkiWiki;
+

 use warnings;
 use strict;
 use Storable;
 use IkiWiki;
 
 use warnings;
 use strict;
 use Storable;
 use IkiWiki;
 

-package IkiWiki;
-

 sub userinfo_retrieve () { #{{{
        my $userinfo=eval{ Storable::lock_retrieve("$config{wikistatedir}/userdb") };
        return $userinfo;
 sub userinfo_retrieve () { #{{{
        my $userinfo=eval{ Storable::lock_retrieve("$config{wikistatedir}/userdb") };
        return $userinfo;

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index d2cc0a69e1df4e774d082f58ac53db30a6564620..79b9eb3e32499229aaa43f8884a776ae8471ccb4 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -1,13 +1,13 @@
 #!/usr/bin/perl
 
 #!/usr/bin/perl
 

+package IkiWiki;
+

 use warnings;
 use strict;
 use Cwd q{abs_path};
 use Data::Dumper;
 use IkiWiki;
 
 use warnings;
 use strict;
 use Cwd q{abs_path};
 use Data::Dumper;
 use IkiWiki;
 

-package IkiWiki;
-

 sub gen_wrapper () { #{{{
        $config{srcdir}=abs_path($config{srcdir});
        $config{destdir}=abs_path($config{destdir});
 sub gen_wrapper () { #{{{
        $config{srcdir}=abs_path($config{srcdir});
        $config{destdir}=abs_path($config{destdir});