Cleanup repo code, support "empty:" urls for repo/dist

perlpunk · Feb 25, 2021 · ae2035d · ae2035d
1 parent 5f02a4c
commit ae2035d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/PBuild/Expand.pm b/PBuild/Expand.pm
@@ -39,7 +39,6 @@ sub configure_repos {
   # code in expanddeps!
   for my $repo (@$repos) {
     my $bins = $repo->{'bins'} || [];
-    my $repono = $repo->{'repono'};
     for my $bin (@$bins) {
       my $n = $bin->{'name'};
       next if $packs_done{$n};
@@ -62,7 +61,6 @@ sub configure_repos {
 	  next if ($oarch eq 'noarch' || $arch ne 'noarch') && $oarch cmp $arch >= 0;
 	}
       }
-      $bin->{'repono'} = $repono;
       $packs{$n} = $bin;
     }
     %packs_done = %packs;

diff --git a/PBuild/RemoteRepo.pm b/PBuild/RemoteRepo.pm
@@ -390,14 +390,10 @@ sub fetchbinaries {
     die("downloaded binary $binname does not match repository metadata\n") unless is_matching_binary($bin, $q);
     rename("$repodir/$tmpname", "$repodir/$binname") || die("rename $repodir/$tmpname $repodir/$binname\n");
     $q->{'filename'} = $binname;
-    # inline replace!
-    $q->{'repono'} = $bin->{'repono'} if defined $bin->{'repono'};
-    %$bin = %$q;
+    %$bin = %$q;	# inline replace!
   }
   # update _metadata
-  my $newbins = PBuild::Util::clone($repo->{'bins'});
-  delete $_->{'repono'} for @$newbins;
-  PBuild::Util::store("$repodir/._metadata.$$", "$repodir/_metadata", $newbins);
+  PBuild::Util::store("$repodir/._metadata.$$", "$repodir/_metadata", $repo->{'bins'});
 }
 
 1;
diff --git a/PBuild/RepoMgr.pm b/PBuild/RepoMgr.pm
@@ -39,6 +39,7 @@ sub create {
 #
 sub addremoterepo {
   my ($repos, $bconf, $myarch, $builddir, $repourl, $buildtype, $opts) = @_;
+  return addemptyrepo($repos) if $repourl =~ /^empty:/;
   my $id = Digest::MD5::md5_hex($repourl);
   return $repos->{$id} if $repos->{$id};
   my $repodir = "$builddir/.pbuild/_base/$id";
@@ -80,6 +81,18 @@ sub addlocalrepo {
   return $repo;
 }
 
+#
+# Add an emptt repository to the manager
+#
+sub addemptyrepo {
+  my ($repos) = @_;
+  my $id = 'empty';
+  return $repos->{$id} if $repos->{$id};
+  my $repo = { 'bins' => [], 'type' => 'empty', 'repoid' => $id };
+  $repos->{$id} = $repo;
+  return $repo;
+}
+
 #
 # Update the local reposiory with new binary data
 #

diff --git a/pbuild b/pbuild
@@ -103,6 +103,8 @@ for my $dist (@{$opts->{'dist'} || []}) {
     my ($obsconfigs, $obsrepos) = PBuild::OBS::fetch_all_configs($dist, $opts, $islast);
     push @baseconfigs, reverse @$obsconfigs;
     push @baseobsrepos, @$obsrepos;
+  } elsif ($dist =~ /^empty:/) {
+    next;
   } elsif (-e "$dir/_configs/$opts->{'dist'}.conf") {
     push @baseconfigs, PBuild::Util::readstr("$dir/_configs/$dist.conf");
   } else {