X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=scanlib.pm;h=f332917688d059bd6f44a86a2cbd0655ff289a44;hp=4705946cc776ae35b0d2e6a31f3cc9d75f93055c;hb=refs%2Fheads%2Ftesting_framework;hpb=98ad74eb8cdf3ce584e496e65d6ea6b2af67cde1

diff --git a/scanlib.pm b/scanlib.pm
index 4705946..f332917 100644
--- a/scanlib.pm
+++ b/scanlib.pm
@@ -51,14 +51,10 @@ sub readmaintainers() {
 }
 
 
-sub readsources() {
-	my $root;					# Root of archive we are scanning
-	my $archive;				# Name of archive we are scanning
-	my $sect;					# Name of current section
-
-	$root=shift;
-	$archive=shift;
-	for $sect (@bugcfg::sections) {
+sub readsources {
+    my ($root,$archive) = @_;
+
+	for my $sect (@bugcfg::sections) {
 		open(P, "zcat $root/$sect/source/Sources.gz|")
 			or die open "open: $sect sourcelist: $!\n";
 		while (<P>) {
@@ -101,12 +97,9 @@ sub readpackages {
     }
 }
 
-sub readdebbugssources() {
-	my $file;
-	my $archive;
+sub readdebbugssources {
+    my ($file,$archive) = @_;
 
-	$file=shift;
-	$archive=shift;
 	open(P, $file)
 		or die "open: $file: $!\n";
 	while (<P>) {
@@ -134,8 +127,6 @@ sub scanspool() {
 	my @dirs;
 	my $dir;
 
-	chdir($bugcfg::spooldir) or die "chdir $bugcfg::spooldir: $!\n";
-
 	opendir(DIR, $bugcfg::spooldir) or die "opendir $bugcfg::spooldir: $!\n";
 	@dirs=grep(m/^\d+$/,readdir(DIR));
 	closedir(DIR);
@@ -156,7 +147,6 @@ sub scanspooldir {
 					
 	my @archs_with_source = ( @bugcfg::architectures, 'source' );
 
-	chdir($dir) or die "chdir $dir: $!\n";
 
 	opendir(DIR, $dir) or die "opendir $dir: $!\n";
 	@list = grep { s/\.summary$// }
@@ -165,7 +155,7 @@ sub scanspooldir {
 	closedir(DIR);
 
 	for $f (@list) {
-		my $bug = Debbugs::Status::read_bug(summary => "$f.summary");
+		my $bug = Debbugs::Status::read_bug(summary => $dir.'/'."$f.summary");
 		next if (!defined($bug));
 		
 		my $bi = {