[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#835528: marked as done (blends-dev: please support option for udeb using blends)

Your message dated Mon, 12 Sep 2016 10:19:38 +0000
with message-id <E1bjOKw-0005pH-Pf@franck.debian.org>
and subject line Bug#835528: fixed in blends 0.6.94
has caused the Debian Bug report #835528,
regarding blends-dev: please support option for udeb using blends
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
835528: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835528
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: blends-dev
Version: 0.6.93
Severity: important
Tags: patch
User: debian-edu@lists.debian.org
Usertags: debian-edu
X-Debbugs-Cc: debian-edu@lists.debian.org


Hi,

while testing Debian Edu Stretch I noticed that the tasks desc file 
generated by blend-gen-control doesn't work with the Debian Edu udeb 
approach; see #834719.

IMO blends-dev should provide the possibility to generate a task desc 
file that is compliant with the case that udebs are used to modify the 
installer.

It would be good for a blend if just adding a line containing 
"TASKSELOPTS = -u" to their own Makefile would generate a compliant 
desc file. Without this line the desc file should be generated as is.

Please check if the modifications below are acceptable:

diff -u a/blends-dev/blend-gen-control b/blends-dev/blend-gen-control
--- a/blends-dev/blend-gen-control	2016-04-09 20:42:00.000000000 +0200
+++ b/blends-dev/blend-gen-control	2016-08-26 17:32:38.818075961 +0200
@@ -60,12 +60,13 @@
    -s <sourcefile>  : specify which sources.list file to use
    -S               : suppress tasks without any recommended package
    -t               : print task descriptions and package list for task
+   -u               : modify tasks desc file in case the blend uses udebs
 
 example: $0 -s sources.list.etch -D -c -m -i
 EOF
 }
 
-getopts("cdaemis:StDhA", \%opts);
+getopts("cdaemis:StuDhA", \%opts);
 
 usage() and exit if $opts{'h'};
 
@@ -281,15 +282,16 @@
 # Enable to list all dependencies as key packages
 my $task_depends_are_keys = 0;
 sub print_task_desc {
-        print "Task: $blendname\n";
-	print "Relevance: 7\n";
-	print "Section: $blendname\n";
+	if (! $opts{'u'} ) {
+	    print "Task: $blendname\n";
+	    print "Relevance: 7\n";
+	    print "Section: $blendname\n";
 #	print "Key: \n";
 #	print " $blendshortname-tasks\n";
-	print "Description: $blendtitle Pure Blend\n";
-	print " .\n"; # no long description available
-	print "\n";
-    
+	    print "Description: $blendtitle Pure Blend\n";
+	    print " .\n"; # no long description available
+	    print "\n";
+	}
         foreach my $task (sort keys %taskinfo) {
                 next if (exists $taskinfo{$task}{'Leaf'} &&
                         $taskinfo{$task}{'Leaf'} eq 'false');
@@ -313,15 +315,22 @@
 		    }
 		}
                 print "Task: $task\n";
-                print "Parent: $blendname\n";
-                print "Section: $blendname\n";
+                if (! $opts{'u'}) {
+		    print "Parent: $blendname\n";
+                }; 
+		print "Section: $blendname\n";
                 print "Description: $taskinfo{$task}{Description}\n";
                 print "$taskinfo{$task}{'Description-long'}"; # Already contain newline
+                if ($opts{'u'}) {
+		    print "Relevance: 10\n";
+		}
                 print "Enhances: $taskinfo{$task}{Enhances}\n"
                     if exists $taskinfo{$task}{Enhances};
 		if (!exists $taskinfo{$task}{'Install'} ||
 		    $taskinfo{$task}{'Install'} ne 'false') {
-		    print "Test-new-install: mark show\n";
+                    if (! $opts{'u'}) {
+			print "Test-new-install: mark show\n";
+		    }
 		}
                 for $header (keys %{$taskinfo{$task}}) {
                     if ($header =~ m/test-.+/i) {
@@ -343,6 +352,15 @@
                     }
                 }
 
+                if ($opts{'u'}) {
+                    print "Packages: list\n";
+                    for my $header (qw(Depends Recommends)) {
+                        foreach my $package (task_packages($task, $header, 1)) {
+                            print " $package\n" unless $seen{$package};
+                            $seen{$package} = 1;
+                        }
+                    }
+                }
                 print "\n";
         }
 }
diff -u a/blends-dev/Makefile b/blends-dev/Makefile
--- a/blends-dev/Makefile	2016-03-31 20:31:00.000000000 +0200
+++ b/blends-dev/Makefile	2016-08-26 15:33:38.000000000 +0200
@@ -11,6 +11,7 @@
 TARGET_DIST := $(shell head -1 debian/changelog |awk '{print $$3}'|tr -d ';')
 BLEND := $(shell /usr/share/blends-dev/blend-get-names blendname)
 GENCONTROL := /usr/share/blends-dev/blend-gen-control
+TASKSELOPTS := $(shell grep TASKSELOPTS Makefile | cut -d '=' -f2)
 
 # Verify whether config/control exists, if yes, add it to the depends of debian/control
 CONFIGCONTROL := $(shell if [ -d config -a -e config/control ] ; then echo config/control; fi)
@@ -26,7 +27,7 @@
 
 tasksel: $(BLEND)-tasks.desc
 $(BLEND)-tasks.desc: tasks/* debian/changelog
-	LC_ALL=C $(GENCONTROL) -s $(TARGET_DIST) -S -t -A > $(BLEND)-tasks.desc.new && mv $(BLEND)-tasks.desc.new $(BLEND)-tasks.desc
+	LC_ALL=C $(GENCONTROL) -s $(TARGET_DIST) $(TASKSELOPTS) -S -t -A > $(BLEND)-tasks.desc.new && mv $(BLEND)-tasks.desc.new $(BLEND)-tasks.desc
 
 packages.txt: tasks/*
 	$(GENCONTROL) -s $(TARGET_DIST) -a > packages.txt.$$$$ && mv packages.txt.$$$$ packages.txt


Wolfgang

Attachment: signature.asc
Description: Digital signature


--- End Message ---
--- Begin Message --- 
Source: blends
Source-Version: 0.6.94

We believe that the bug you reported is fixed in the latest version of
blends, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 835528@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Ole Streicher <olebole@debian.org> (supplier of updated blends package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Mon, 12 Sep 2016 09:40:48 +0200
Source: blends
Binary: blends-dev blends-common blends-doc blends-tasks
Architecture: source all
Version: 0.6.94
Distribution: unstable
Urgency: medium
Maintainer: Debian Pure Blend Team <debian-blends@lists.debian.org>
Changed-By: Ole Streicher <olebole@debian.org>
Description:
 blends-common - Debian Pure Blends common package
 blends-dev - Debian Pure Blends common files for developing metapackages
 blends-doc - Debian Pure Blends documentation
 blends-tasks - Debian Pure Blends tasks for new installations
Closes: 825004 835528
Changes:
 blends (0.6.94) unstable; urgency=medium
 .
   [ Ole Streicher ]
   * Make the default install opt-in instead of opt-out, and create the
     <blends>-all package only when there were tasks opted-in as default
     install. Closes: 825004
   * Adjust descriptions for the installer's tasksel
   * Remove debian-science from the installer's tasksel
 .
   [ Holger Levsen ]
   * Adjust description of Debian Edu: use correct project spelling and improve
     language.
 .
   [ Andreas Tille ]
   * Apply patch by Wolfgang Schweer <wschweer@arcor.de> to support udebs using
     blends (thanks Wolfgang for the patch
     Closes: #835528
   * Bump Standards-Version
   * Fix typo in d/rules
Checksums-Sha1:
 9aa8b0267c686cc2b0582d0dae931fcca6aa06e7 1880 blends_0.6.94.dsc
 50d1c2d2bbeb4bec800fd2856cb1c2e49de8d0fe 102084 blends_0.6.94.tar.xz
 7e4cd7a51e0719aa2ed89c011d76b95ac1bafa9e 23144 blends-common_0.6.94_all.deb
 6a6c4e3d6759a5b5ff4fb48bf97c71401af03fdf 32774 blends-dev_0.6.94_all.deb
 02a7a08a9b0f4604b02f0fae1f62ffa27925ec3a 447622 blends-doc_0.6.94_all.deb
 19499186428124ebe392ac6fc969f73f06e87be3 12716 blends-tasks_0.6.94_all.deb
Checksums-Sha256:
 0576d43ae8d27b1356aee868efa53dcac86e0a0d3a50e8d6ec3fd4f1cccb7aea 1880 blends_0.6.94.dsc
 2e5f7885019c775cd3177d024e9438243323bf29fc3d335da16677227a628506 102084 blends_0.6.94.tar.xz
 4598c04cf17c8e80e95bfd509363ff76d2abac6340b7640e3f27173daba5db33 23144 blends-common_0.6.94_all.deb
 133eef02a09753c438225b263a3416d2b19c0b40794f20aae070fab299666a65 32774 blends-dev_0.6.94_all.deb
 5f632678be76006c1606ab843b5c09cfe8d2b9c142654cf913cea1bb17ae32a4 447622 blends-doc_0.6.94_all.deb
 a76674cbf33785e24e3f020cb1f34cf7ed2fa48b05bd58f9acea69d097886aee 12716 blends-tasks_0.6.94_all.deb
Files:
 aa3ef1ad3daf465aaf2fc204d0a20ed8 1880 devel optional blends_0.6.94.dsc
 fb30097c80dfbec9895764fcf0e12698 102084 devel optional blends_0.6.94.tar.xz
 a040f2ac34b426178bc7516bf3e96fc8 23144 misc optional blends-common_0.6.94_all.deb
 2cfab3f1d7176ffcc90cd8f859f49957 32774 devel optional blends-dev_0.6.94_all.deb
 a54a0151fdf98ab6ddf0675d75e37e90 447622 doc optional blends-doc_0.6.94_all.deb
 f035b67c760ad017696b5b513ed12812 12716 misc important blends-tasks_0.6.94_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAEBCAAGBQJX1l9iAAoJEFeKBJTRxkbRGGsP/iWJRvJXv3Bb8gBHsixp18r5
j36HoUC72OEBMHHY+B8dwUMM/tEE9jw+bRA/n6YRrzDjxM7PXabHRnJ1n+kO5uUA
JOGRLtkQttc08JjnPktyH7z/U/EgHsVQB00rkFYqYdSEWg8sY8HXXQlcpj/Eskna
jz5z2PdwJF67r3Qp//ASN6L42uWLouJPiP4XPHwV76uztfpFDe2KyWjNlv1aVD3q
YxyFCVYvaUP1NlNZHJEk5r++TVKQllg7bqv8fu/eD3o7x5UPU/rWJI9BpXnp9bjv
BbODkL9NMRg9VXvNpRVqzYJugzjpblf5N/bNR/KMFmQpOAjuEXjR2f3XyCYzQrnr
CDnp56qcyTqVzBkG0H51r2D8mtX7vMNSOgjMU/r3wtCImbZr8EKvWRjfPtoA2eUO
hgC1suXZmny0Wl9GaQSfuCZ6k1cacAs0TFC5MIa7Djq7yeh4x8RzswMvQeaF2L5f
9TCTi9mzd5nOvY1wxghLFwTht93JAG0JN26QL7T+dlhUVcf4ciPyvruLtYFtLm4h
2SqUIEU4FdHQuVvFIdEhnpqdldO+kUDLx1KumXyu+adI1oTqWSR6Wy5iOKMo2chn
z/3FyMVd/5+8l5NCEAfUP8KnAJzM4v2L30gaRc9WgE9KmNGLrhkpykjjj9OnbPyt
y23pSvpgFVTPYxwpmyFl
=njXS
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: