← Back to branch summary

~ubuntu-branches/ubuntu/trusty/debmirror/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/skip-installer.patch

  • Committer: Bazaar Package Importer
  • Author(s): Anders Kaseorg
  • Date: 2009-02-15 16:42:27 UTC
  • Revision ID: james.westby@ubuntu.com-20090215164227-7pghhzb50t1dbuqf
Tags: 20070123ubuntu3
https://launchpad.net/bugs/34376
Fix a regression in the estimated download size calculation introduced
by skip-installer.patch.  (LP: #34376)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/skip-installer.patch
51
51
 
52
52
 # Display configuration.
53
53
 $|=1 if $debug;
54
 
@@ -706,11 +713,13 @@
 
54
@@ -706,6 +713,6 @@
55
55
       add_bytes("dists/$dist/$section/binary-$arch/Packages.diff/Index") unless ($pdiff_mode eq "none");
56
56
     }
57
 
     if ($do_source) {
58
 
-      add_bytes("dists/$dist/$section/source/Sources");
59
 
-      add_bytes("dists/$dist/$section/source/Sources.gz");
60
 
-      add_bytes("dists/$dist/$section/source/Sources.bz2");
61
 
-      add_bytes("dists/$dist/$section/source/Release");
62
 
-      add_bytes("dists/$dist/$section/source/Sources.diff/Index") unless ($pdiff_mode eq "none");
63
 
+      if ($section=~"debian-installer") {
64
 
+        add_bytes("dists/$dist/$section/source/Sources");
65
 
+        add_bytes("dists/$dist/$section/source/Sources.gz");
66
 
+        add_bytes("dists/$dist/$section/source/Sources.bz2");
67
 
+        add_bytes("dists/$dist/$section/source/Release");
68
 
+        add_bytes("dists/$dist/$section/source/Sources.diff/Index") unless ($pdiff_mode eq "none");
69
 
+      }
70
 
     }
71
 
   }
72
 
 }
 
57
-    if ($do_source) {
 
58
+    if ($do_source && $section !~ /debian-installer/) {
 
59
       add_bytes("dists/$dist/$section/source/Sources");
 
60
       add_bytes("dists/$dist/$section/source/Sources.gz");
 
61
       add_bytes("dists/$dist/$section/source/Sources.bz2");
73
62
@@ -755,10 +764,23 @@
74
63
       next if ($section =~ /debian-installer/ && $dist =~ /.*-proposed-updates/);
75
64
       next if ($section =~ /debian-installer/ && $dist =~ /.*breezy-updates/ );
91
80
         $okay = 0 unless &{$process_func}("dists/$dist/$section/binary-$arch", "Packages", $extension);
92
81
       }
93
82
-      if ($do_source) {
94
 
+      if ($do_source && !($section=~"debian-installer")) {
 
83
+      if ($do_source && $section !~ /debian-installer/) {
95
84
         $okay = 0 unless &{$process_func}("dists/$dist/$section/source", "Sources", $extension);
96
85
       }
97
86
     }