diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> | 2006-08-01 09:51:41 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> | 2006-08-01 09:51:41 +0000 |
| commit | 733e2b8c0699e602fc617149a96b61a4e07dce35 (patch) | |
| tree | 0373e2ca293e90d415070f10ca38f22edbf67acc | |
| parent | b5e3ae7adddf827cea42c0b8778e1fbcea71b6ae (diff) | |
| download | perl-MDV-Distribconf-733e2b8c0699e602fc617149a96b61a4e07dce35.tar perl-MDV-Distribconf-733e2b8c0699e602fc617149a96b61a4e07dce35.tar.gz perl-MDV-Distribconf-733e2b8c0699e602fc617149a96b61a4e07dce35.tar.bz2 perl-MDV-Distribconf-733e2b8c0699e602fc617149a96b61a4e07dce35.tar.xz perl-MDV-Distribconf-733e2b8c0699e602fc617149a96b61a4e07dce35.zip | |
Nits, copyright, english fixes
| -rw-r--r-- | .cvsignore | 5 | ||||
| -rw-r--r-- | lib/MDV/Distribconf.pm | 23 |
2 files changed, 12 insertions, 16 deletions
diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 658469f..0000000 --- a/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -META.yml -Makefile -blib -pm_to_blib -.cvsignore diff --git a/lib/MDV/Distribconf.pm b/lib/MDV/Distribconf.pm index 70e13a0..e44cc09 100644 --- a/lib/MDV/Distribconf.pm +++ b/lib/MDV/Distribconf.pm @@ -232,7 +232,8 @@ sub loadtree { =head2 check_mediacfg_version($wanted_version) -Check current distrib use this version or lesser, which mean it is supported. +Check that the current distrib uses this version or lesser, which means it is +supported. =cut @@ -393,18 +394,18 @@ sub getvalue { my $default = ""; for ($var) { - /^synthesis$/ and $default = 'synthesis.' . lc($distrib->getvalue($media, 'hdlist')); + /^synthesis$/ and $default = 'synthesis.' . lc($distrib->getvalue($media, 'hdlist')); /^hdlist$/ and $default = 'hdlist_' . lc($distrib->getvalue($media, 'name')) . '.cz'; /^pubkey$/ and $default = 'pubkey_' . lc($distrib->getvalue($media, 'name')); /^name$/ and $default = $media; $default =~ s![/ ]+!_!g; - /^path$/ and return $media; - /^root$/ and return $distrib->{root}; - /^mediacfg_version$/ and do { $default = '1'; last }; - /^VERSION$/ and do { $default = 'VERSION'; last }; - /^product$/ and do { $default = 'Download'; last }; - /^(?:tag|branch)$/ and do { $default = ''; last }; - /^(?:media|info)dir$/ and do { $default = $distrib->{$var}; last }; + /^path$/ and return $media; + /^root$/ and return $distrib->{root}; + /^mediacfg_version$/ and do { $default = '1'; last }; + /^VERSION$/ and do { $default = 'VERSION'; last }; + /^product$/ and do { $default = 'Download'; last }; + /^(?:tag|branch)$/ and do { $default = ''; last }; + /^(?:media|info)dir$/ and do { $default = $distrib->{$var}; last }; } return $distrib->{cfg}->val($media, $var, $default); } @@ -426,7 +427,7 @@ sub getpath { if ($distrib->getvalue(undef, 'mediacfg_version') >= 2) { return $thispath . ($media ? '/' . $val : ''); } else { - return ($val =~ m!/! ? "" : + return ($val =~ m!/! ? "" : ($var eq 'path' ? $distrib->{mediadir} : $distrib->{infodir} ) . "/") . $val; } @@ -460,7 +461,7 @@ The code has been written by Olivier Thauvin <nanardon@mandriva.org> and is currently maintained by Rafael Garcia-Suarez <rgarciasuarez@mandriva.com>. Thanks to Sylvie Terjan <erinmargault@mandriva.org> for the spell checking. -(c) 2005 Olivier Thauvin ; (c) 2005 Mandriva Linux +(c) 2005 Olivier Thauvin ; (c) 2005, 2006 Mandriva This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by |