Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4747e43752 | |||
| 2d1c16e76e | |||
| 4dbbc6b34a | |||
| 36999309c2 | |||
| 1ef3938a96 |
@@ -15,7 +15,7 @@ $ENV{FEATURES} = $ENV{FEATURES}
|
||||
|
||||
my $equo_install_atoms = $ENV{EQUO_INSTALL_ATOMS} // 1;
|
||||
my $equo_install_version = $ENV{EQUO_INSTALL_VERSION} // 0;
|
||||
my $equo_split_install = $ENV{EQUO_SPLIT_INSTALL} // 1;
|
||||
my $equo_split_install = $ENV{EQUO_SPLIT_INSTALL} // 0;
|
||||
my $equo_mirrorsort = $ENV{EQUO_MIRRORSORT} // 1;
|
||||
my $entropy_repository = $ENV{ENTROPY_REPOSITORY}
|
||||
// "main"; # Can be weekly, main, testing
|
||||
@@ -211,6 +211,10 @@ sub calculate_missing {
|
||||
my @to_install = grep( defined $available_packs{$_},
|
||||
uniq( grep( !defined $installed_packs{$_}, @dependencies ) ) );
|
||||
@to_install = grep { length } @to_install;
|
||||
|
||||
# Strip out the target package from the dependency list
|
||||
@to_install = grep { to_atom($_) ne to_atom($package) } @to_install;
|
||||
|
||||
say "[$package] packages that will be installed with equo: @to_install"
|
||||
if @to_install > 0;
|
||||
|
||||
@@ -220,6 +224,8 @@ sub calculate_missing {
|
||||
# Input : complete gentoo package (sys-fs/foobarfs-1.9.2)
|
||||
# Output: atom form (sys-fs/foobarfs)
|
||||
sub atom { s/-[0-9]{1,}.*$//; }
|
||||
# Same again as a function
|
||||
sub to_atom { my $p=shift; $p =~ s/-[0-9]{1,}.*$//; return $p; }
|
||||
|
||||
# Input: Array
|
||||
# Output: array with unique elements
|
||||
@@ -322,6 +328,8 @@ if ( $remote_portdir ne "" ) {
|
||||
system("chown -R portage:portage /usr/portage");
|
||||
system("chmod -R ug+w,a+rX /usr/portage");
|
||||
}
|
||||
system("mkdir /var/lib/layman") if ( ! -d "/var/lib/layman" );
|
||||
system("touch /var/lib/layman/make.conf && layman-updater -R") if ( ! -e "/var/lib/layman/make.conf" );
|
||||
|
||||
system("echo 'y' | layman -f -a $_") for @overlays;
|
||||
|
||||
@@ -385,7 +393,9 @@ unless ( $skip_portage_sync == 1 ) {
|
||||
}
|
||||
|
||||
# preparing for MOAR automation
|
||||
qx|eselect profile set $profile|;
|
||||
say "Setting new profile to $profile" if defined $profile;
|
||||
qx|eselect profile set $profile| if defined $profile;
|
||||
system("eselect profile list") if defined $profile;
|
||||
|
||||
if ( $use_equo && $entropy_repository eq "weekly" ) {
|
||||
qx|equo repo disable sabayonlinux.org|;
|
||||
|
||||
+2
-2
@@ -88,8 +88,8 @@ database-format = bz2
|
||||
# disabled-eapis = 1,2
|
||||
# expiration-based-scope = disable
|
||||
# nonfree-packages-directory-support = disable
|
||||
rss-feed = disable
|
||||
changelog = disable
|
||||
rss-feed = enable
|
||||
changelog = enable
|
||||
rss-name = packages.rss
|
||||
rss-base-url = http://packages.sabayon.org/?quicksearch=
|
||||
rss-website-url = http://www.sabayon.org/
|
||||
|
||||
Reference in New Issue
Block a user