[elbe-devel] [PATCH 1/1] cdroms: fix network access in src-cdrom build for real

Torben Hohn torben.hohn at linutronix.de
Wed Sep 25 11:37:45 CEST 2019


CdromSrcRepo() takes a mirror parameter that defaults to
http://ftp.debian.org/debian. It needs to be fed from the primary mirror,
which is not necessarily ftp.debian.org.

916fb9f257f1 ("cdroms: fix network access when building src cdrom")
is a broken cherry-pick from the mainline commit
5d4d96b28f2d ("cdroms: fix network access when building src cdrom")
that should have fixed this over a year ago.

remove the superflous broken call to CdromSrcRepo()

Signed-off-by: Torben Hohn <torben.hohn at linutronix.de>
---
 elbepack/cdroms.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/elbepack/cdroms.py b/elbepack/cdroms.py
index 4a73ba81b..5ae6e0da8 100644
--- a/elbepack/cdroms.py
+++ b/elbepack/cdroms.py
@@ -36,11 +36,6 @@ def mk_source_cdrom(rfs, arch, codename, init_codename, target, log, cdrom_size=
     hostfs.mkdir_p( '/var/cache/elbe/sources' )
     rfs.mkdir_p( '/var/cache/elbe/sources' )
 
-    repo = CdromSrcRepo( codename, init_codename,
-                         os.path.join( target, "srcrepo" ),
-                         log,
-                         cdrom_size )
-
     if not xml is None:
         mirror = xml.get_primary_mirror (rfs.fname("cdrom"))
     else:
-- 
2.20.1




More information about the elbe-devel mailing list