Forráskód Böngészése

Remove white space at EOL

Markus Hennecke 7 éve
szülő
commit
94981d45e0
1 módosított fájl, 19 hozzáadás és 19 törlés
  1. 19 19
      autoupdate.pl

+ 19 - 19
autoupdate.pl

@@ -129,7 +129,7 @@ sub reap {
 
 
 # Reads a config file and parses the options set in the config file.
-# A list of valid options must be passed to the function. 
+# A list of valid options must be passed to the function.
 sub read_rc_file {
 	my $valid_vars = shift;
 	my ($fh, @lines, %config);
@@ -173,7 +173,7 @@ sub read_rc_file {
 
 		# Check if the line has a = character, if not issue an error
 		if (! m/=/) {
-			print STDERR 'Not a valid config in line ' 
+			print STDERR 'Not a valid config in line '
 			    . $real_lineno . "\n";
 			return undef;
 		}
@@ -243,7 +243,7 @@ sub get_ports_version {
 	my $cmd = 'make show=FULLPKGNAME';
 	my $pkgname = '';
 
-	open(my $in, "$cmd 2>&1 |") 
+	open(my $in, "$cmd 2>&1 |")
 	    or die "Unable to get version for \"$port\"\n";
 	while (<$in>) {
 		chomp;
@@ -251,7 +251,7 @@ sub get_ports_version {
 	}
 	close($in);
 
-	my ($stem, $version, @flavors) 
+	my ($stem, $version, @flavors)
 	    = OpenBSD::PackageName::splitname($pkgname);
 	return $version;
 }
@@ -286,7 +286,7 @@ sub get_higher_version {
 		my $vers2 = $vers2[$index];
 		my $cmp;
 		if (($vers1 =~ /[a-z]/) || ($vers2 =~ /[a-z]/)) {
-			$cmp = ($vers2 cmp $vers1); 
+			$cmp = ($vers2 cmp $vers1);
 		}
 		else {
 			$cmp = ($vers2 <=> $vers1);
@@ -333,7 +333,7 @@ sub read_update_package_list {
 	}
 	else {
 		unless (open($in, '<', $input)) {
-			print STDERR "Unable to open file: " . $input 
+			print STDERR "Unable to open file: " . $input
 			    . " for reading\n";
 			exit 1;
 		}
@@ -379,7 +379,7 @@ sub create_package_information {
 		# $2 :  port name, which must start with at least one alpha
 		#	char and may have a number appended.
 		#	Some examples may be gtk+2, libIDL etc.
-		# $3 :	optional subdirs for the port, $4 will hold the last 
+		# $3 :	optional subdirs for the port, $4 will hold the last
 		# $5 :  an optional subpackage name, this will start with a
 		#	comma followed by an hyphen and have an alphanumeric
 		#	identifier
@@ -415,7 +415,7 @@ sub create_package_information {
 			);
 			$p{dependencies} = create_dependencies_list(\%p);
 			$p{jobs} = set_parallel_build(\%p);
-			$p{deppkgs} 
+			$p{deppkgs}
 				= create_dependencies_hash($p{dependencies});
 			$p{pseudo_flavors} = create_pseudo_flavors_list(\%p);
 			add_pseudo_flavors(\%p);
@@ -426,7 +426,7 @@ sub create_package_information {
 			print STDERR "Unknown port name: $pkg\n";
 			exit 2;
 		}
-		print STDOUT "Category:\t$category\n" 
+		print STDOUT "Category:\t$category\n"
 		    . "Port:\t\t$port\n"
 		    . "Subdir:\t\t$subdir\n"
 		    . "Subpackage:\t$subpackage\n"
@@ -437,7 +437,7 @@ sub create_package_information {
 }
 
 
-# Adds pseudo flavors to the flavors list if they appear both in the 
+# Adds pseudo flavors to the flavors list if they appear both in the
 # pseudo_flavors array from the ports info hash and the %pseudo_flavors
 # global hash set via command line.
 sub add_pseudo_flavors {
@@ -501,7 +501,7 @@ sub get_pkg_info {
 		$info_pkg_name =~ s/$regex_subpkg$regex_flavor//g;
 		return $info if ($info_pkg_name eq $pkg_name);
 	}
-	die "ERROR: Internal error, package information not consistent.\n"; 
+	die "ERROR: Internal error, package information not consistent.\n";
 }
 
 
@@ -522,7 +522,7 @@ sub find_newer_ports_dir {
 		$info->{portdir} = "$portsdir_path/$port";
 		return ($port, $info->{portdir});
 	}
-	   
+	
 	my @versions = ();
 	foreach my $dir (@port_locations) {
 		my $port_dir = "$dir/$port";
@@ -533,8 +533,8 @@ sub find_newer_ports_dir {
 	my $highest
 	    = reduce { get_higher_version($a, $b) <= 0 ? $a : $b } @versions;
 	my $idx = 0;
-	$idx = grep 
-		{ defined($versions[$_]) 
+	$idx = grep
+		{ defined($versions[$_])
 		    && ($versions[$_] eq $highest) ? $_ : -1 } 0..$#versions
 	    if (scalar @versions > 1);
 	$info->{portdir} = "$port_locations[$idx - 1]/$port";
@@ -579,7 +579,7 @@ sub build_pkg {
 
 	print STDOUT "Building $info->{pkg}\n";
 	my (@log, $logfile, $logfilename);
-	open(my $in, "$cmd 2>&1 |") 
+	open(my $in, "$cmd 2>&1 |")
 	    or die "Unable to make \"$port\"\n";
 	if (defined $logdir) {
 		my $tmp = $info->{port};
@@ -608,10 +608,10 @@ sub build_pkg {
 		    if ($info->{subpkg} ne '');
 		$cmd .= $sudo if ($sudo_make_clean);
 		$cmd .= ' make update clean';
-		open($in, "$cmd 2>&1 |") 
+		open($in, "$cmd 2>&1 |")
 		    or die "Unable to update \"$port\"\n";
 		while (<$in>) {
-			print STDOUT $_ 
+			print STDOUT $_
 			    unless (($verbose < 2) || ($num_jobs > 1));
 			print $logfile $_ if (defined $logfile);
 			push @log, ($_);
@@ -681,7 +681,7 @@ sub create_dependencies_list {
 	my ($port, $port_dir) = find_newer_ports_dir($info);
 	chdir $port_dir or die "Unable to change to \"$port_dir\"\n";
 
-	open(my $in, "$cmd |") 
+	open(my $in, "$cmd |")
 	    or die "Unable to get dependencies for \"$port\"\n";
 	while (<$in>) {
 		chomp;
@@ -880,7 +880,7 @@ foreach my $pkg_name (@pkg_list)  {
 	while (($jobs >= $num_jobs || can_pkg_be_build($info)) && !$abort) {
 		if ($wait_for_dep_notice == 0 && !can_pkg_be_build($info)) {
 			print STDOUT "Waiting for dependant package to finish "
-			    . "building (" . $pkg_name . ")\n" 
+			    . "building (" . $pkg_name . ")\n"
 				unless ($verbose < 2);
 			$wait_for_dep_notice++;
 		}