urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make --gettime be honored after initial setup. 

Bugfix in passing: New files not treated as such when no rcs is used.
master
Joey Hess 2010-06-15 22:56:06 -04:00
parent f7d4904fee
commit 5f33532468
2 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
IkiWiki/Render.pm
View File

@ -300,6 +300,7 @@ sub find_src_files () {
my ($page, $underlay); my ($page, $underlay);
my $helper=sub { my $helper=sub {
my $file=decode_utf8($_); my $file=decode_utf8($_);
return if -l $file || -d _; return if -l $file || -d _;
$file=~s/^\.\///; $file=~s/^\.\///;
return if ! length $file; return if ! length $file;
@ -363,18 +364,9 @@ sub find_new_files ($) {
foreach my $file (@$files) { foreach my $file (@$files) {
my $page=pagename($file); my $page=pagename($file);
if (exists $pagesources{$page} && $pagesources{$page} ne $file) {
# the page has changed its type if ($config{rcs} && $config{gettime} &&
$forcerebuild{$page}=1; -e "$config{srcdir}/$file") {
}
$pagesources{$page}=$file;
if (! $pagemtime{$page}) {
if (isinternal($page)) {
push @internal_new, $file;
}
elsif ($config{rcs}) {
push @new, $file;
if ($config{gettime} && -e "$config{srcdir}/$file") {
if (! $times_noted) { if (! $times_noted) {
debug(sprintf(gettext("querying %s for file creation and modification times.."), $config{rcs})); debug(sprintf(gettext("querying %s for file creation and modification times.."), $config{rcs}));
$times_noted=1; $times_noted=1;
@ -400,6 +392,18 @@ sub find_new_files ($) {
utime($mtime, $mtime, "$config{srcdir}/$file"); utime($mtime, $mtime, "$config{srcdir}/$file");
} }
} }
if (exists $pagesources{$page} && $pagesources{$page} ne $file) {
# the page has changed its type
$forcerebuild{$page}=1;
}
$pagesources{$page}=$file;
if (! $pagemtime{$page}) {
if (isinternal($page)) {
push @internal_new, $file;
}
else {
push @new, $file;
} }
$pagecase{lc $page}=$page; $pagecase{lc $page}=$page;
if (! exists $pagectime{$page}) { if (! exists $pagectime{$page}) {

1
debian/changelog vendored
View File

@ -18,6 +18,7 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
* calendar: Tune archive_pagespec to only match pages, not other files. * calendar: Tune archive_pagespec to only match pages, not other files.
* Fix issues with combining unicode srcdirs and source files. * Fix issues with combining unicode srcdirs and source files.
(Workaround bug #586045) (Workaround bug #586045)
* Make --gettime be honored after initial setup.
-- Joey Hess <joeyh@debian.org> Fri, 11 Jun 2010 13:39:15 -0400 -- Joey Hess <joeyh@debian.org> Fri, 11 Jun 2010 13:39:15 -0400