diff options
Diffstat (limited to 'app-portage/epm/files/epm')
| -rw-r--r-- | app-portage/epm/files/epm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app-portage/epm/files/epm b/app-portage/epm/files/epm index 29d3d2f..3922749 100644 --- a/app-portage/epm/files/epm +++ b/app-portage/epm/files/epm @@ -6,13 +6,13 @@ use Cwd qw(abs_path); # Global vars my $version = "EPM version 1.40"; my $verbose = 0; -my $dbpath = '/var/db/pkg'; +my $dbpath = '@GENTOO_PORTAGE_EPREFIX@/var/db/pkg'; my $pkgregex = '^.+?\/'. # group (ignored) '(.+?)'. # name '-(\d+(?:\.\d+)*\w*)'. # version, eg 1.23.4a '((?:(?:_alpha|_beta|_pre|_rc)\d*)?)'. # special suffix - '((?:-r\d+)?)$'; # revision, eg r12 + '((?:-r\d+)?(?:\.\d+)?)$'; # revision, eg r12 or r01.1 my $root = '/'; my %opt = ( 'dbpath' => \$dbpath, @@ -266,11 +266,11 @@ sub query_list($) if ($opt{'c'}) { # Read in CONFIG_PROTECT from /etc/make.{global,conf} my (@CONFIG_PROTECT) = split ' ', - `. /etc/make.globals; . /etc/make.conf; echo \$CONFIG_PROTECT`; + `. @GENTOO_PORTAGE_EPREFIX@/etc/make.globals; . @GENTOO_PORTAGE_EPREFIX@/etc/make.conf; echo \$CONFIG_PROTECT`; die "CONFIG_PROTECT is empty" unless @CONFIG_PROTECT; my ($confprotre) = join '|', @CONFIG_PROTECT; @files = grep { - (split ' ', $_, 2)[1] =~ /^($confprotre)/o } @files; + (split ' ', $_, 2)[1] =~ m!^@GENTOO_PORTAGE_EPREFIX@($confprotre)!o } @files; } # Trim @files if doc files requested |