Bug#523017: debian-cd: Doesn't support local udebs if using a repo that requires section: local/debian-installer for local udebs
On Wed, 8 Apr 2009 05:16:15 +0200
Frans Pop elen...@planet.nl wrote:
Can you resend a cleaned up patch please?
This should be exactly as needed for the current version of debian-cd
(squeeze version anyway).
--
And that's my crabbing done for the day. Got it out of the way early,
now I have the rest of the afternoon to sniff fragrant tea-roses or
strangle cute bunnies or something. -- Michael Devore
GnuPG Key Fingerprint 86 F5 81 A5 D4 2E 1F 1C http://gnupg.org
The C Shore (Daniel Dickinson's Website) http://www.bmts.com/~cshore
diff -Naur debian-cd.orig/tools/make_disc_trees.pl debian-cd/tools/make_disc_trees.pl
--- debian-cd.orig/tools/make_disc_trees.pl 2009-07-17 14:10:10.0 -0400
+++ debian-cd/tools/make_disc_trees.pl 2009-07-17 14:10:49.0 -0400
@@ -449,11 +449,15 @@
$filename = $File::Find::name;
if ((-d $_) ($filename =~ m/\/main\/binary-[^\/]*$/)) {
- if ((-f $_/Packages) (! -d ../local/$_/)) {
- mkdir ../local/$_/ || die Error creating directory local/$_: $!\n;
+ if (-f $_/Packages) {
+ if (! -d ../local/$_/) {
+ mkdir ../local/$_/ || die Error creating directory local/$_: $!\n;
+ }
+ if ( ! -f ../local/$_/Packages ) {
open(LPFILE, ../local/$_/Packages) or die Error creating local/$_/Packages: $!\n;
close LPFILE;
print Created empty Packages file for local/$_\n;
+ }
}
}
}
@@ -735,8 +739,8 @@
}
$pdir = $dir/dists/$codename/$dist;
-if ($section and $section eq debian-installer) {
-$pdir = $dir/dists/$codename/$dist/debian-installer;
+if ($section and (($section eq debian-installer) or ($section eq local/debian-installer))) {
+ $pdir = $dir/dists/$codename/$dist/debian-installer;
}
return $pdir;
}
signature.asc
Description: PGP signature
Bug#523017: debian-cd: Doesn't support local udebs if using a repo that requires section: local/debian-installer for local udebs
Package: debian-cd
Version: 3.1.1
Severity: minor
Tags: patch
I'm using reprepro and in order to get packages stored in the local dist I have
to use Section: local/section (therefore local/debian-installer for custom
debian-installer udebs). debian-cd doesn't create Packages{.gz} files for
local/debian-installer. This patch fixes that.
-- System Information:
Debian Release: 5.0
APT prefers stable
APT policy: (500, 'stable'), (1, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.6.26-1-686 (SMP w/1 CPU core)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Versions of packages debian-cd depends on:
ii apt 0.7.20.2 Advanced front-end for dpkg
ii bc 1.06.94-3The GNU bc arbitrary precision cal
ii cpp 4:4.3.2-2The GNU C preprocessor (cpp)
ii curl7.18.2-8lenny2 Get a file from an HTTP, HTTPS or
ii dctrl-tools [grep-dctrl 2.13.1 Command-line tools to process Debi
ii genisoimage 9:1.1.9-1Creates ISO-9660 CD-ROM filesystem
ii libcompress-zlib-perl 2.012-1 Perl module for creation and manip
ii lynx-cur2.8.7dev9-2.1Text-mode WWW Browser with NLS sup
ii make3.81-5 The GNU version of the make util
ii perl [libdigest-md5-per 5.10.0-19Larry Wall's Practical Extraction
ii tofrodos1.7.8.debian.1-1 Converts DOS - Unix text files,
Versions of packages debian-cd recommends:
pn hfsutils none(no description available)
ii netpbm 2:10.0-12 Graphics conversion tools
ii syslinux-common2:3.71+dfsg-5 Kernel loader which uses a FAT, ex
debian-cd suggests no packages.
-- no debconf information
738,739c738,743
if ($section and $section eq debian-installer) {
$pdir = $dir/dists/$codename/$dist/debian-installer;
---
if (($section and $section eq debian-installer) or ($section and
$section eq local/debian-installer)) {
# if ($dist and $dist eq local) {
# $pdir = $dir/dists/$codename/debian-installer;
# } else {
$pdir = $dir/dists/$codename/$dist/debian-installer;
# }
Bug#523017: debian-cd: Doesn't support local udebs if using a repo that requires section: local/debian-installer for local udebs
On Tuesday 07 April 2009, Daniel Dickinson wrote:
I'm using reprepro and in order to get packages stored in the local
dist I have to use Section: local/section (therefore
local/debian-installer for custom debian-installer udebs). debian-cd
doesn't create Packages{.gz} files for local/debian-installer. This
patch fixes that.
Looks OK in principle, but please always submit patches as a unified diff
(i.e. using the '-u' option). Also, the patch does not include the diff
header which shows what file it is against. Without that it cannot be
applied using the 'patch' command.
Finally, why are some of the added lines commented out? If they are not
needed, they should not be included in the patch; if they are, they
should obviously not be commented out.
Can you resend a cleaned up patch please?
Cheers,
FJP
--
To UNSUBSCRIBE, email to debian-cd-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
