aboutsummaryrefslogtreecommitdiff
path: root/sboupgrade
diff options
context:
space:
mode:
authorAndreas Guldstrand <andreas.guldstrand@gmail.com>2016-02-12 12:17:51 +0100
committerAndreas Guldstrand <andreas.guldstrand@gmail.com>2016-02-12 21:46:28 +0100
commitcf55cb0d8e61337bbfdf261eb4262a3c799db8ae (patch)
tree06e1eeb05bd2d57b71b28e4bde397c6fd2d12065 /sboupgrade
parent1b1385ad465d1c01f2391b4e92049dc84f8c863b (diff)
downloadsbotools2-cf55cb0d8e61337bbfdf261eb4262a3c799db8ae.tar.xz
Don't try to install or upgrade slackware packages
Diffstat (limited to 'sboupgrade')
-rwxr-xr-xsboupgrade8
1 files changed, 8 insertions, 0 deletions
diff --git a/sboupgrade b/sboupgrade
index 0739078..cb5cc10 100755
--- a/sboupgrade
+++ b/sboupgrade
@@ -98,6 +98,12 @@ slackbuilds_or_fetch();
my @sbos = uniq @ARGV;
+# Filter out standard packages
+my $std_installs = get_inst_names(get_installed_packages('STD'));
+my %std_names;
+$std_names{$_} = 1 for @$std_installs;
+@sbos = grep { not $std_names{$_} } @sbos;
+
# pull locations for everything specified on command line.
my %locations;
for my $sbo (@sbos) {
@@ -169,6 +175,8 @@ if ($non_int) {
# Get user input regarding upgrades
my (@temp_queue, %commands, %options);
FIRST: for my $sbo (@$upgrade_queue) {
+ next FIRST if $std_names{$sbo};
+
unless ($non_int) {
my ($cmds, $opts, $exit) = user_prompt($sbo, $locations{$sbo});
if ($exit) {