Author: mpagano Date: 2014-04-15 18:44:55 +0000 (Tue, 15 Apr 2014) New Revision: 2754
Modified: genpatches-2.6-misc/web/gentoo_sources_web.pm genpatches-2.6-misc/web/makesite.pl Log: Fix web creating scripts. Again. Modified: genpatches-2.6-misc/web/gentoo_sources_web.pm =================================================================== --- genpatches-2.6-misc/web/gentoo_sources_web.pm 2014-04-15 14:43:34 UTC (rev 2753) +++ genpatches-2.6-misc/web/gentoo_sources_web.pm 2014-04-15 18:44:55 UTC (rev 2754) @@ -24,13 +24,13 @@ $subversion_midpart = 'anonsvn.gentoo.org'; } $subversion_root = $subversion_scheme.'://'.$subversion_midpart.'/linux-patches/genpatches-2.6'; -my $webscript_path = &Cwd::cwd(); +$webscript_path = &Cwd::cwd(); $output_path = $webscript_path.'/output'; -my $website_base = 'http://dev.gentoo.org/~mpagano/genpatches'; +$website_base = 'http://dev.gentoo.org/~mpagano/genpatches'; -my $ebuild_base = '/usr/local/gentoo-x86'; # /usr/portage -my @kernels = ('sys-kernel/ck-sources','sys-kernel/gentoo-sources','sys-kernel/hardened-sources','sys-kernel/openvz-sources','sys-kernel/tuxonice-sources','sys-kernel/vserver-sources','sys-kernel/zen-sources'); +$ebuild_base = '/usr/local/gentoo-x86'; # /usr/portage +@kernels = ('sys-kernel/ck-sources','sys-kernel/gentoo-sources','sys-kernel/hardened-sources','sys-kernel/openvz-sources','sys-kernel/tuxonice-sources','sys-kernel/vserver-sources','sys-kernel/zen-sources'); sub html_header { local *FD = shift; @@ -324,6 +324,7 @@ foreach $kernel (@kernels) { $kernel =~ m/^([a-z-]+)\/([a-z0-9-]+)$/; + print "Got kernel $kernel\n"; my $cat = $1; my $pkg = $2; $cmd = 'egrep --color=never "^(K_GENPATCHES_VER|K_WANT_GENPATCHES)" '.$ebuild_base.'/'.$kernel.'/*.ebuild'; Modified: genpatches-2.6-misc/web/makesite.pl =================================================================== --- genpatches-2.6-misc/web/makesite.pl 2014-04-15 14:43:34 UTC (rev 2753) +++ genpatches-2.6-misc/web/makesite.pl 2014-04-15 18:44:55 UTC (rev 2754) @@ -202,7 +202,6 @@ local *DIR; print ">> Making release pages\n"; $cmd = 'svn ls '.$subversion_root.'/tags'; - print "cmd is $cmd\n"; @out = `$cmd`; foreach (@out) { @@ -227,6 +226,8 @@ $patch =~ m/^(.*)-patches\.htm$/; copy($webscript_path.'/generated/'.$patch, $webscript_path.'/output/patches-'.$1.'.htm'); } + +print "Done\n"; } sub mysort { @@ -291,6 +292,7 @@ local $ext; $ext = get_tarball_ext($tag); + #print "Writing to $webscript_path/generated/$tag-patches.htm"; open(PATCHLIST, '> '.$webscript_path.'/generated/'.$tag.'-patches.htm'); html_header(PATCHLIST, "$tag Patch List"); print PATCHLIST '<h1>'.$tag.' Patch List</h1>';