ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-09 10:39:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implement masking and descriptions for module manager, thanks danieldg

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10429 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
w00t 2008-09-07 03:27:54 +00:00
parent 3e72c8cb7e
commit 5217069a0e
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
modulemanager
View File

@ -12,10 +12,12 @@ my %installed;
my %modules; my %modules;
# $modules{$name}{$version} = { # $modules{$name}{$version} = {
# url => URL of this version (or INSECURE/DEPRECATED) # url => URL of this version
# depends => [ 'm_foo 1.2.0-1.3.0', ... ] # depends => [ 'm_foo 1.2.0-1.3.0', ... ]
# conflicts => [ ] # conflicts => [ ]
# from => URL of source document # from => URL of source document
# mask => Reason for not installing (INSECURE/DEPRECATED)
# description => some string
# } # }
my %url_seen; my %url_seen;
@ -51,6 +53,10 @@ sub parse_url {
push @{$mod->{depends}}, $1; push @{$mod->{depends}}, $1;
} elsif (/^conflicts (.*)/) { } elsif (/^conflicts (.*)/) {
push @{$mod->{conflicts}}, $1; push @{$mod->{conflicts}}, $1;
} elsif (/^description (.*)/) {
$mod->{description} = $1;
} elsif (/^mask (.*)/) {
$mod->{mask} = $1;
} elsif (m#^source (http://\S+)#) { } elsif (m#^source (http://\S+)#) {
parse_url $1; parse_url $1;
} else { } else {
@ -68,9 +74,7 @@ close SRC;
getmodules(); getmodules();
open my $verfile, 'src/version.sh' or die "Cannot determine inspircd version: $!"; `./src/version.sh` =~ /InspIRCd-([0-9.]+)/ or die "Cannot determine inspircd version";
$_ = join '', <$verfile>;
die "Cannot determine inspircd version" unless /InspIRCd-([0-9.]+)/;
$installed{core} = $1; $installed{core} = $1;
$modules{core}{$1} = { $modules{core}{$1} = {
url => 'NONE', url => 'NONE',
@ -78,12 +82,12 @@ $modules{core}{$1} = {
conflicts => [], conflicts => [],
from => 'local file', from => 'local file',
}; };
close $verfile;
for my $modname (@modlist) { for my $modname (@modlist) {
my $mod = "m_$modname"; my $mod = "m_$modname";
my $modfile = "src/modules/$mod.cpp"; my $modfile = "src/modules/$mod.cpp";
my $ver = getmodversion($modfile) || '0.0'; my $ver = getmodversion($modfile) || '0.0';
$ver =~ s/\$Rev: (.*) \$/$1/; # for storing revision in SVN
$installed{$mod} = $ver; $installed{$mod} = $ver;
next if $modules{$mod}{$ver}; next if $modules{$mod}{$ver};
$modules{$mod}{$ver} = { $modules{$mod}{$ver} = {
@ -122,10 +126,11 @@ sub ver_in_range {
} }
sub find_mod_in_range { sub find_mod_in_range {
my($mod,$vers) = @_; my($mod, $vers, $force) = @_;
my @versions = keys %{$modules{$mod}}; my @versions = keys %{$modules{$mod}};
@versions = sort { ver_cmp() } @versions; @versions = sort { -ver_cmp() } @versions;
for my $ver (reverse @versions) { for my $ver (@versions) {
next if $modules{$mod}{$ver}{mask} && !$force;
return $ver if ver_in_range($ver, $vers); return $ver if ver_in_range($ver, $vers);
} }
return undef; return undef;
@ -153,7 +158,7 @@ sub resolve_deps {
$todo{$depmod} = $depver; $todo{$depmod} = $depver;
$changes .= " $mod-$ver->$depmod-$depver"; $changes .= " $mod-$ver->$depmod-$depver";
} else { } else {
$fail ||= "Could not find module $depmod $depver required by $mod $ver"; $fail ||= "Could not find module $depmod $depvers required by $mod $ver";
} }
} }
for my $dep (@{$info->{conflicts}}) { for my $dep (@{$info->{conflicts}}) {
@ -185,7 +190,7 @@ if ($action eq 'install') {
print "Cannot find module $mod\n"; print "Cannot find module $mod\n";
exit 1; exit 1;
} }
my $ver = find_mod_in_range($mod, $vers); my $ver = find_mod_in_range($mod, $vers, $vers ? 1 : 0);
unless ($ver) { unless ($ver) {
print "Cannot find suitable version of $mod\n"; print "Cannot find suitable version of $mod\n";
exit 1; exit 1;
@ -213,15 +218,11 @@ for my $mod (keys %installed) {
for my $mod (sort keys %todo) { for my $mod (sort keys %todo) {
my $ver = $todo{$mod}; my $ver = $todo{$mod};
my $oldver = $installed{$mod}; my $oldver = $installed{$mod};
my $url = $modules{$mod}{$ver}{url}; if ($modules{$mod}{$ver}{mask}) {
if ($url eq 'INSECURE') { print "Module $mod $ver is masked: $modules{$mod}{$ver}{mask}\n";
print "WARNING: Version $ver of $mod is insecure!\n";
next;
} elsif ($url eq 'DEPRECATED') {
print "Note: version $ver of $mod is deprecated\n";
next;
} }
next if $oldver && $oldver eq $ver; next if $oldver && $oldver eq $ver;
my $url = $modules{$mod}{$ver}{url};
if ($oldver) { if ($oldver) {
print "Upgrading $mod from $oldver to $ver using $url" print "Upgrading $mod from $oldver to $ver using $url"
} else { } else {

2
src/version.sh
View File

@ -1,2 +1,2 @@
#!sh #!/bin/sh
echo "InspIRCd-1.2.0a6+Tuxer" echo "InspIRCd-1.2.0a6+Tuxer"