Merge ~chad.smith/ubuntu/+source/update-notifier:ua-motd-bionic into ubuntu/+source/update-notifier:ubuntu/bionic-proposed
- Git
- lp:~chad.smith/ubuntu/+source/update-notifier
- ua-motd-bionic
- Merge into ubuntu/bionic-proposed
Status: | Needs review | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Proposed branch: | ~chad.smith/ubuntu/+source/update-notifier:ua-motd-bionic | ||||||||||||
Merge into: | ubuntu/+source/update-notifier:ubuntu/bionic-proposed | ||||||||||||
Diff against target: |
729 lines (+204/-182) (has conflicts) 8 files modified
INSTALL (+159/-161) config.h.in (+8/-0) data/apt_check.py (+11/-10) data/hooks.py (+1/-1) data/package-data-downloader (+2/-2) debian/changelog (+15/-0) tests/test_package-data-downloader.py (+7/-7) tests/test_pep8.py (+1/-1) Conflict in debian/changelog |
||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Brian Murray | Pending | ||
Review via email: mp+392487@code.launchpad.net |
Commit message
Description of the change
Cherry-picks to sort FTSBFS and missed cherry-pick for motd wording on package updates.
git cherry-pick 6794d0f3d507705
git cherry-pick af28cd4d6 # motd wording
git cherry-pick f881447e2fc755b
Unmerged commits
- 433be1a... by Gianfranco Costamagna
-
Fix E117 over-indented pep issues.
- 1eedf60... by Julian Andres Klode
-
apt-check: Update wording to match spec
- 2d7ed67... by Andrea Azzarone
-
* data/apt_check.py, data/package-
data-downloader , tests/test_pep8.py:
- update the code formating to be not hit W504 warnings,
change to ignore W503 and be consistent with update-manager. - 5e8cdcf... by Chad Smith
-
changelog
- 131011b... by Julian Andres Klode
-
Fix multiple disabled ESM repositories being counted as enabled ones.
- e4b340a... by Brian Murray
-
data/apt_check.py: modify wording and output regarding ESM support.
(LP: #1842508) - 7a72a66... by Andreas Hasenack
-
* data/apt_check.py: Update ESM security pockets names (LP: #1881632)
- the UbuntuESM pocket was renamed from <distro>-security to
<distro> -infra- security
- new origin UbuntuESMApps, with a corresponding pocket of
<distro> -apps-security Patch from
https://bugs.launchpad .net/ubuntu/ +source/ update- notifier/ +bug/1881632/ comments/ 1 - 14b2284... by Julian Andres Klode
-
We told people ESM is not enabled, but not how to enable it.
LP: #1822340
- abaf607... by Julian Andres Klode
-
apt-check: Tell people to enable ESM if ESM updates are available
- 6f97e28... by Julian Andres Klode
-
apt-check: Count enabled ESM upgrades
Preview Diff
1 | diff --git a/INSTALL b/INSTALL | |||
2 | index 2099840..8865734 100644 | |||
3 | --- a/INSTALL | |||
4 | +++ b/INSTALL | |||
5 | @@ -1,8 +1,8 @@ | |||
6 | 1 | Installation Instructions | 1 | Installation Instructions |
7 | 2 | ************************* | 2 | ************************* |
8 | 3 | 3 | ||
11 | 4 | Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, | 4 | Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software |
12 | 5 | Inc. | 5 | Foundation, Inc. |
13 | 6 | 6 | ||
14 | 7 | Copying and distribution of this file, with or without modification, | 7 | Copying and distribution of this file, with or without modification, |
15 | 8 | are permitted in any medium without royalty provided the copyright | 8 | are permitted in any medium without royalty provided the copyright |
16 | @@ -12,97 +12,96 @@ without warranty of any kind. | |||
17 | 12 | Basic Installation | 12 | Basic Installation |
18 | 13 | ================== | 13 | ================== |
19 | 14 | 14 | ||
21 | 15 | Briefly, the shell command `./configure && make && make install' | 15 | Briefly, the shell command './configure && make && make install' |
22 | 16 | should configure, build, and install this package. The following | 16 | should configure, build, and install this package. The following |
24 | 17 | more-detailed instructions are generic; see the `README' file for | 17 | more-detailed instructions are generic; see the 'README' file for |
25 | 18 | instructions specific to this package. Some packages provide this | 18 | instructions specific to this package. Some packages provide this |
27 | 19 | `INSTALL' file but do not implement all of the features documented | 19 | 'INSTALL' file but do not implement all of the features documented |
28 | 20 | below. The lack of an optional feature in a given package is not | 20 | below. The lack of an optional feature in a given package is not |
29 | 21 | necessarily a bug. More recommendations for GNU packages can be found | 21 | necessarily a bug. More recommendations for GNU packages can be found |
30 | 22 | in *note Makefile Conventions: (standards)Makefile Conventions. | 22 | in *note Makefile Conventions: (standards)Makefile Conventions. |
31 | 23 | 23 | ||
33 | 24 | The `configure' shell script attempts to guess correct values for | 24 | The 'configure' shell script attempts to guess correct values for |
34 | 25 | various system-dependent variables used during compilation. It uses | 25 | various system-dependent variables used during compilation. It uses |
38 | 26 | those values to create a `Makefile' in each directory of the package. | 26 | those values to create a 'Makefile' in each directory of the package. |
39 | 27 | It may also create one or more `.h' files containing system-dependent | 27 | It may also create one or more '.h' files containing system-dependent |
40 | 28 | definitions. Finally, it creates a shell script `config.status' that | 28 | definitions. Finally, it creates a shell script 'config.status' that |
41 | 29 | you can run in the future to recreate the current configuration, and a | 29 | you can run in the future to recreate the current configuration, and a |
44 | 30 | file `config.log' containing compiler output (useful mainly for | 30 | file 'config.log' containing compiler output (useful mainly for |
45 | 31 | debugging `configure'). | 31 | debugging 'configure'). |
46 | 32 | 32 | ||
52 | 33 | It can also use an optional file (typically called `config.cache' | 33 | It can also use an optional file (typically called 'config.cache' and |
53 | 34 | and enabled with `--cache-file=config.cache' or simply `-C') that saves | 34 | enabled with '--cache-file=config.cache' or simply '-C') that saves the |
54 | 35 | the results of its tests to speed up reconfiguring. Caching is | 35 | results of its tests to speed up reconfiguring. Caching is disabled by |
55 | 36 | disabled by default to prevent problems with accidental use of stale | 36 | default to prevent problems with accidental use of stale cache files. |
51 | 37 | cache files. | ||
56 | 38 | 37 | ||
57 | 39 | If you need to do unusual things to compile the package, please try | 38 | If you need to do unusual things to compile the package, please try |
60 | 40 | to figure out how `configure' could check whether to do them, and mail | 39 | to figure out how 'configure' could check whether to do them, and mail |
61 | 41 | diffs or instructions to the address given in the `README' so they can | 40 | diffs or instructions to the address given in the 'README' so they can |
62 | 42 | be considered for the next release. If you are using the cache, and at | 41 | be considered for the next release. If you are using the cache, and at |
64 | 43 | some point `config.cache' contains results you don't want to keep, you | 42 | some point 'config.cache' contains results you don't want to keep, you |
65 | 44 | may remove or edit it. | 43 | may remove or edit it. |
66 | 45 | 44 | ||
71 | 46 | The file `configure.ac' (or `configure.in') is used to create | 45 | The file 'configure.ac' (or 'configure.in') is used to create |
72 | 47 | `configure' by a program called `autoconf'. You need `configure.ac' if | 46 | 'configure' by a program called 'autoconf'. You need 'configure.ac' if |
73 | 48 | you want to change it or regenerate `configure' using a newer version | 47 | you want to change it or regenerate 'configure' using a newer version of |
74 | 49 | of `autoconf'. | 48 | 'autoconf'. |
75 | 50 | 49 | ||
76 | 51 | The simplest way to compile this package is: | 50 | The simplest way to compile this package is: |
77 | 52 | 51 | ||
80 | 53 | 1. `cd' to the directory containing the package's source code and type | 52 | 1. 'cd' to the directory containing the package's source code and type |
81 | 54 | `./configure' to configure the package for your system. | 53 | './configure' to configure the package for your system. |
82 | 55 | 54 | ||
84 | 56 | Running `configure' might take a while. While running, it prints | 55 | Running 'configure' might take a while. While running, it prints |
85 | 57 | some messages telling which features it is checking for. | 56 | some messages telling which features it is checking for. |
86 | 58 | 57 | ||
88 | 59 | 2. Type `make' to compile the package. | 58 | 2. Type 'make' to compile the package. |
89 | 60 | 59 | ||
91 | 61 | 3. Optionally, type `make check' to run any self-tests that come with | 60 | 3. Optionally, type 'make check' to run any self-tests that come with |
92 | 62 | the package, generally using the just-built uninstalled binaries. | 61 | the package, generally using the just-built uninstalled binaries. |
93 | 63 | 62 | ||
95 | 64 | 4. Type `make install' to install the programs and any data files and | 63 | 4. Type 'make install' to install the programs and any data files and |
96 | 65 | documentation. When installing into a prefix owned by root, it is | 64 | documentation. When installing into a prefix owned by root, it is |
97 | 66 | recommended that the package be configured and built as a regular | 65 | recommended that the package be configured and built as a regular |
99 | 67 | user, and only the `make install' phase executed with root | 66 | user, and only the 'make install' phase executed with root |
100 | 68 | privileges. | 67 | privileges. |
101 | 69 | 68 | ||
103 | 70 | 5. Optionally, type `make installcheck' to repeat any self-tests, but | 69 | 5. Optionally, type 'make installcheck' to repeat any self-tests, but |
104 | 71 | this time using the binaries in their final installed location. | 70 | this time using the binaries in their final installed location. |
105 | 72 | This target does not install anything. Running this target as a | 71 | This target does not install anything. Running this target as a |
107 | 73 | regular user, particularly if the prior `make install' required | 72 | regular user, particularly if the prior 'make install' required |
108 | 74 | root privileges, verifies that the installation completed | 73 | root privileges, verifies that the installation completed |
109 | 75 | correctly. | 74 | correctly. |
110 | 76 | 75 | ||
111 | 77 | 6. You can remove the program binaries and object files from the | 76 | 6. You can remove the program binaries and object files from the |
116 | 78 | source code directory by typing `make clean'. To also remove the | 77 | source code directory by typing 'make clean'. To also remove the |
117 | 79 | files that `configure' created (so you can compile the package for | 78 | files that 'configure' created (so you can compile the package for |
118 | 80 | a different kind of computer), type `make distclean'. There is | 79 | a different kind of computer), type 'make distclean'. There is |
119 | 81 | also a `make maintainer-clean' target, but that is intended mainly | 80 | also a 'make maintainer-clean' target, but that is intended mainly |
120 | 82 | for the package's developers. If you use it, you may have to get | 81 | for the package's developers. If you use it, you may have to get |
121 | 83 | all sorts of other programs in order to regenerate files that came | 82 | all sorts of other programs in order to regenerate files that came |
122 | 84 | with the distribution. | 83 | with the distribution. |
123 | 85 | 84 | ||
125 | 86 | 7. Often, you can also type `make uninstall' to remove the installed | 85 | 7. Often, you can also type 'make uninstall' to remove the installed |
126 | 87 | files again. In practice, not all packages have tested that | 86 | files again. In practice, not all packages have tested that |
127 | 88 | uninstallation works correctly, even though it is required by the | 87 | uninstallation works correctly, even though it is required by the |
128 | 89 | GNU Coding Standards. | 88 | GNU Coding Standards. |
129 | 90 | 89 | ||
131 | 91 | 8. Some packages, particularly those that use Automake, provide `make | 90 | 8. Some packages, particularly those that use Automake, provide 'make |
132 | 92 | distcheck', which can by used by developers to test that all other | 91 | distcheck', which can by used by developers to test that all other |
134 | 93 | targets like `make install' and `make uninstall' work correctly. | 92 | targets like 'make install' and 'make uninstall' work correctly. |
135 | 94 | This target is generally not run by end users. | 93 | This target is generally not run by end users. |
136 | 95 | 94 | ||
137 | 96 | Compilers and Options | 95 | Compilers and Options |
138 | 97 | ===================== | 96 | ===================== |
139 | 98 | 97 | ||
140 | 99 | Some systems require unusual options for compilation or linking that | 98 | Some systems require unusual options for compilation or linking that |
142 | 100 | the `configure' script does not know about. Run `./configure --help' | 99 | the 'configure' script does not know about. Run './configure --help' |
143 | 101 | for details on some of the pertinent environment variables. | 100 | for details on some of the pertinent environment variables. |
144 | 102 | 101 | ||
148 | 103 | You can give `configure' initial values for configuration parameters | 102 | You can give 'configure' initial values for configuration parameters |
149 | 104 | by setting variables in the command line or in the environment. Here | 103 | by setting variables in the command line or in the environment. Here is |
150 | 105 | is an example: | 104 | an example: |
151 | 106 | 105 | ||
152 | 107 | ./configure CC=c99 CFLAGS=-g LIBS=-lposix | 106 | ./configure CC=c99 CFLAGS=-g LIBS=-lposix |
153 | 108 | 107 | ||
154 | @@ -113,21 +112,21 @@ Compiling For Multiple Architectures | |||
155 | 113 | 112 | ||
156 | 114 | You can compile the package for more than one kind of computer at the | 113 | You can compile the package for more than one kind of computer at the |
157 | 115 | same time, by placing the object files for each architecture in their | 114 | same time, by placing the object files for each architecture in their |
159 | 116 | own directory. To do this, you can use GNU `make'. `cd' to the | 115 | own directory. To do this, you can use GNU 'make'. 'cd' to the |
160 | 117 | directory where you want the object files and executables to go and run | 116 | directory where you want the object files and executables to go and run |
164 | 118 | the `configure' script. `configure' automatically checks for the | 117 | the 'configure' script. 'configure' automatically checks for the source |
165 | 119 | source code in the directory that `configure' is in and in `..'. This | 118 | code in the directory that 'configure' is in and in '..'. This is known |
166 | 120 | is known as a "VPATH" build. | 119 | as a "VPATH" build. |
167 | 121 | 120 | ||
169 | 122 | With a non-GNU `make', it is safer to compile the package for one | 121 | With a non-GNU 'make', it is safer to compile the package for one |
170 | 123 | architecture at a time in the source code directory. After you have | 122 | architecture at a time in the source code directory. After you have |
172 | 124 | installed the package for one architecture, use `make distclean' before | 123 | installed the package for one architecture, use 'make distclean' before |
173 | 125 | reconfiguring for another architecture. | 124 | reconfiguring for another architecture. |
174 | 126 | 125 | ||
175 | 127 | On MacOS X 10.5 and later systems, you can create libraries and | 126 | On MacOS X 10.5 and later systems, you can create libraries and |
176 | 128 | executables that work on multiple system types--known as "fat" or | 127 | executables that work on multiple system types--known as "fat" or |
179 | 129 | "universal" binaries--by specifying multiple `-arch' options to the | 128 | "universal" binaries--by specifying multiple '-arch' options to the |
180 | 130 | compiler but only a single `-arch' option to the preprocessor. Like | 129 | compiler but only a single '-arch' option to the preprocessor. Like |
181 | 131 | this: | 130 | this: |
182 | 132 | 131 | ||
183 | 133 | ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ | 132 | ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ |
184 | @@ -136,105 +135,104 @@ this: | |||
185 | 136 | 135 | ||
186 | 137 | This is not guaranteed to produce working output in all cases, you | 136 | This is not guaranteed to produce working output in all cases, you |
187 | 138 | may have to build one architecture at a time and combine the results | 137 | may have to build one architecture at a time and combine the results |
189 | 139 | using the `lipo' tool if you have problems. | 138 | using the 'lipo' tool if you have problems. |
190 | 140 | 139 | ||
191 | 141 | Installation Names | 140 | Installation Names |
192 | 142 | ================== | 141 | ================== |
193 | 143 | 142 | ||
198 | 144 | By default, `make install' installs the package's commands under | 143 | By default, 'make install' installs the package's commands under |
199 | 145 | `/usr/local/bin', include files under `/usr/local/include', etc. You | 144 | '/usr/local/bin', include files under '/usr/local/include', etc. You |
200 | 146 | can specify an installation prefix other than `/usr/local' by giving | 145 | can specify an installation prefix other than '/usr/local' by giving |
201 | 147 | `configure' the option `--prefix=PREFIX', where PREFIX must be an | 146 | 'configure' the option '--prefix=PREFIX', where PREFIX must be an |
202 | 148 | absolute file name. | 147 | absolute file name. |
203 | 149 | 148 | ||
204 | 150 | You can specify separate installation prefixes for | 149 | You can specify separate installation prefixes for |
205 | 151 | architecture-specific files and architecture-independent files. If you | 150 | architecture-specific files and architecture-independent files. If you |
207 | 152 | pass the option `--exec-prefix=PREFIX' to `configure', the package uses | 151 | pass the option '--exec-prefix=PREFIX' to 'configure', the package uses |
208 | 153 | PREFIX as the prefix for installing programs and libraries. | 152 | PREFIX as the prefix for installing programs and libraries. |
209 | 154 | Documentation and other data files still use the regular prefix. | 153 | Documentation and other data files still use the regular prefix. |
210 | 155 | 154 | ||
211 | 156 | In addition, if you use an unusual directory layout you can give | 155 | In addition, if you use an unusual directory layout you can give |
217 | 157 | options like `--bindir=DIR' to specify different values for particular | 156 | options like '--bindir=DIR' to specify different values for particular |
218 | 158 | kinds of files. Run `configure --help' for a list of the directories | 157 | kinds of files. Run 'configure --help' for a list of the directories |
219 | 159 | you can set and what kinds of files go in them. In general, the | 158 | you can set and what kinds of files go in them. In general, the default |
220 | 160 | default for these options is expressed in terms of `${prefix}', so that | 159 | for these options is expressed in terms of '${prefix}', so that |
221 | 161 | specifying just `--prefix' will affect all of the other directory | 160 | specifying just '--prefix' will affect all of the other directory |
222 | 162 | specifications that were not explicitly provided. | 161 | specifications that were not explicitly provided. |
223 | 163 | 162 | ||
224 | 164 | The most portable way to affect installation locations is to pass the | 163 | The most portable way to affect installation locations is to pass the |
226 | 165 | correct locations to `configure'; however, many packages provide one or | 164 | correct locations to 'configure'; however, many packages provide one or |
227 | 166 | both of the following shortcuts of passing variable assignments to the | 165 | both of the following shortcuts of passing variable assignments to the |
229 | 167 | `make install' command line to change installation locations without | 166 | 'make install' command line to change installation locations without |
230 | 168 | having to reconfigure or recompile. | 167 | having to reconfigure or recompile. |
231 | 169 | 168 | ||
232 | 170 | The first method involves providing an override variable for each | 169 | The first method involves providing an override variable for each |
234 | 171 | affected directory. For example, `make install | 170 | affected directory. For example, 'make install |
235 | 172 | prefix=/alternate/directory' will choose an alternate location for all | 171 | prefix=/alternate/directory' will choose an alternate location for all |
236 | 173 | directory configuration variables that were expressed in terms of | 172 | directory configuration variables that were expressed in terms of |
250 | 174 | `${prefix}'. Any directories that were specified during `configure', | 173 | '${prefix}'. Any directories that were specified during 'configure', |
251 | 175 | but not in terms of `${prefix}', must each be overridden at install | 174 | but not in terms of '${prefix}', must each be overridden at install time |
252 | 176 | time for the entire installation to be relocated. The approach of | 175 | for the entire installation to be relocated. The approach of makefile |
253 | 177 | makefile variable overrides for each directory variable is required by | 176 | variable overrides for each directory variable is required by the GNU |
254 | 178 | the GNU Coding Standards, and ideally causes no recompilation. | 177 | Coding Standards, and ideally causes no recompilation. However, some |
255 | 179 | However, some platforms have known limitations with the semantics of | 178 | platforms have known limitations with the semantics of shared libraries |
256 | 180 | shared libraries that end up requiring recompilation when using this | 179 | that end up requiring recompilation when using this method, particularly |
257 | 181 | method, particularly noticeable in packages that use GNU Libtool. | 180 | noticeable in packages that use GNU Libtool. |
258 | 182 | 181 | ||
259 | 183 | The second method involves providing the `DESTDIR' variable. For | 182 | The second method involves providing the 'DESTDIR' variable. For |
260 | 184 | example, `make install DESTDIR=/alternate/directory' will prepend | 183 | example, 'make install DESTDIR=/alternate/directory' will prepend |
261 | 185 | `/alternate/directory' before all installation names. The approach of | 184 | '/alternate/directory' before all installation names. The approach of |
262 | 186 | `DESTDIR' overrides is not required by the GNU Coding Standards, and | 185 | 'DESTDIR' overrides is not required by the GNU Coding Standards, and |
263 | 187 | does not work on platforms that have drive letters. On the other hand, | 186 | does not work on platforms that have drive letters. On the other hand, |
264 | 188 | it does better at avoiding recompilation issues, and works well even | 187 | it does better at avoiding recompilation issues, and works well even |
267 | 189 | when some directory options were not specified in terms of `${prefix}' | 188 | when some directory options were not specified in terms of '${prefix}' |
268 | 190 | at `configure' time. | 189 | at 'configure' time. |
269 | 191 | 190 | ||
270 | 192 | Optional Features | 191 | Optional Features |
271 | 193 | ================= | 192 | ================= |
272 | 194 | 193 | ||
273 | 195 | If the package supports it, you can cause programs to be installed | 194 | If the package supports it, you can cause programs to be installed |
282 | 196 | with an extra prefix or suffix on their names by giving `configure' the | 195 | with an extra prefix or suffix on their names by giving 'configure' the |
283 | 197 | option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. | 196 | option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'. |
284 | 198 | 197 | ||
285 | 199 | Some packages pay attention to `--enable-FEATURE' options to | 198 | Some packages pay attention to '--enable-FEATURE' options to |
286 | 200 | `configure', where FEATURE indicates an optional part of the package. | 199 | 'configure', where FEATURE indicates an optional part of the package. |
287 | 201 | They may also pay attention to `--with-PACKAGE' options, where PACKAGE | 200 | They may also pay attention to '--with-PACKAGE' options, where PACKAGE |
288 | 202 | is something like `gnu-as' or `x' (for the X Window System). The | 201 | is something like 'gnu-as' or 'x' (for the X Window System). The |
289 | 203 | `README' should mention any `--enable-' and `--with-' options that the | 202 | 'README' should mention any '--enable-' and '--with-' options that the |
290 | 204 | package recognizes. | 203 | package recognizes. |
291 | 205 | 204 | ||
293 | 206 | For packages that use the X Window System, `configure' can usually | 205 | For packages that use the X Window System, 'configure' can usually |
294 | 207 | find the X include and library files automatically, but if it doesn't, | 206 | find the X include and library files automatically, but if it doesn't, |
297 | 208 | you can use the `configure' options `--x-includes=DIR' and | 207 | you can use the 'configure' options '--x-includes=DIR' and |
298 | 209 | `--x-libraries=DIR' to specify their locations. | 208 | '--x-libraries=DIR' to specify their locations. |
299 | 210 | 209 | ||
300 | 211 | Some packages offer the ability to configure how verbose the | 210 | Some packages offer the ability to configure how verbose the |
302 | 212 | execution of `make' will be. For these packages, running `./configure | 211 | execution of 'make' will be. For these packages, running './configure |
303 | 213 | --enable-silent-rules' sets the default to minimal output, which can be | 212 | --enable-silent-rules' sets the default to minimal output, which can be |
305 | 214 | overridden with `make V=1'; while running `./configure | 213 | overridden with 'make V=1'; while running './configure |
306 | 215 | --disable-silent-rules' sets the default to verbose, which can be | 214 | --disable-silent-rules' sets the default to verbose, which can be |
308 | 216 | overridden with `make V=0'. | 215 | overridden with 'make V=0'. |
309 | 217 | 216 | ||
310 | 218 | Particular systems | 217 | Particular systems |
311 | 219 | ================== | 218 | ================== |
312 | 220 | 219 | ||
315 | 221 | On HP-UX, the default C compiler is not ANSI C compatible. If GNU | 220 | On HP-UX, the default C compiler is not ANSI C compatible. If GNU CC |
316 | 222 | CC is not installed, it is recommended to use the following options in | 221 | is not installed, it is recommended to use the following options in |
317 | 223 | order to use an ANSI C compiler: | 222 | order to use an ANSI C compiler: |
318 | 224 | 223 | ||
319 | 225 | ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" | 224 | ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" |
320 | 226 | 225 | ||
321 | 227 | and if that doesn't work, install pre-built binaries of GCC for HP-UX. | 226 | and if that doesn't work, install pre-built binaries of GCC for HP-UX. |
322 | 228 | 227 | ||
327 | 229 | HP-UX `make' updates targets which have the same time stamps as | 228 | HP-UX 'make' updates targets which have the same time stamps as their |
328 | 230 | their prerequisites, which makes it generally unusable when shipped | 229 | prerequisites, which makes it generally unusable when shipped generated |
329 | 231 | generated files such as `configure' are involved. Use GNU `make' | 230 | files such as 'configure' are involved. Use GNU 'make' instead. |
326 | 232 | instead. | ||
330 | 233 | 231 | ||
331 | 234 | On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot | 232 | On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot |
335 | 235 | parse its `<wchar.h>' header file. The option `-nodtk' can be used as | 233 | parse its '<wchar.h>' header file. The option '-nodtk' can be used as a |
336 | 236 | a workaround. If GNU CC is not installed, it is therefore recommended | 234 | workaround. If GNU CC is not installed, it is therefore recommended to |
337 | 237 | to try | 235 | try |
338 | 238 | 236 | ||
339 | 239 | ./configure CC="cc" | 237 | ./configure CC="cc" |
340 | 240 | 238 | ||
341 | @@ -242,26 +240,26 @@ and if that doesn't work, try | |||
342 | 242 | 240 | ||
343 | 243 | ./configure CC="cc -nodtk" | 241 | ./configure CC="cc -nodtk" |
344 | 244 | 242 | ||
346 | 245 | On Solaris, don't put `/usr/ucb' early in your `PATH'. This | 243 | On Solaris, don't put '/usr/ucb' early in your 'PATH'. This |
347 | 246 | directory contains several dysfunctional programs; working variants of | 244 | directory contains several dysfunctional programs; working variants of |
350 | 247 | these programs are available in `/usr/bin'. So, if you need `/usr/ucb' | 245 | these programs are available in '/usr/bin'. So, if you need '/usr/ucb' |
351 | 248 | in your `PATH', put it _after_ `/usr/bin'. | 246 | in your 'PATH', put it _after_ '/usr/bin'. |
352 | 249 | 247 | ||
355 | 250 | On Haiku, software installed for all users goes in `/boot/common', | 248 | On Haiku, software installed for all users goes in '/boot/common', |
356 | 251 | not `/usr/local'. It is recommended to use the following options: | 249 | not '/usr/local'. It is recommended to use the following options: |
357 | 252 | 250 | ||
358 | 253 | ./configure --prefix=/boot/common | 251 | ./configure --prefix=/boot/common |
359 | 254 | 252 | ||
360 | 255 | Specifying the System Type | 253 | Specifying the System Type |
361 | 256 | ========================== | 254 | ========================== |
362 | 257 | 255 | ||
364 | 258 | There may be some features `configure' cannot figure out | 256 | There may be some features 'configure' cannot figure out |
365 | 259 | automatically, but needs to determine by the type of machine the package | 257 | automatically, but needs to determine by the type of machine the package |
366 | 260 | will run on. Usually, assuming the package is built to be run on the | 258 | will run on. Usually, assuming the package is built to be run on the |
368 | 261 | _same_ architectures, `configure' can figure that out, but if it prints | 259 | _same_ architectures, 'configure' can figure that out, but if it prints |
369 | 262 | a message saying it cannot guess the machine type, give it the | 260 | a message saying it cannot guess the machine type, give it the |
372 | 263 | `--build=TYPE' option. TYPE can either be a short name for the system | 261 | '--build=TYPE' option. TYPE can either be a short name for the system |
373 | 264 | type, such as `sun4', or a canonical name which has the form: | 262 | type, such as 'sun4', or a canonical name which has the form: |
374 | 265 | 263 | ||
375 | 266 | CPU-COMPANY-SYSTEM | 264 | CPU-COMPANY-SYSTEM |
376 | 267 | 265 | ||
377 | @@ -270,101 +268,101 @@ where SYSTEM can have one of these forms: | |||
378 | 270 | OS | 268 | OS |
379 | 271 | KERNEL-OS | 269 | KERNEL-OS |
380 | 272 | 270 | ||
383 | 273 | See the file `config.sub' for the possible values of each field. If | 271 | See the file 'config.sub' for the possible values of each field. If |
384 | 274 | `config.sub' isn't included in this package, then this package doesn't | 272 | 'config.sub' isn't included in this package, then this package doesn't |
385 | 275 | need to know the machine type. | 273 | need to know the machine type. |
386 | 276 | 274 | ||
387 | 277 | If you are _building_ compiler tools for cross-compiling, you should | 275 | If you are _building_ compiler tools for cross-compiling, you should |
389 | 278 | use the option `--target=TYPE' to select the type of system they will | 276 | use the option '--target=TYPE' to select the type of system they will |
390 | 279 | produce code for. | 277 | produce code for. |
391 | 280 | 278 | ||
392 | 281 | If you want to _use_ a cross compiler, that generates code for a | 279 | If you want to _use_ a cross compiler, that generates code for a |
393 | 282 | platform different from the build platform, you should specify the | 280 | platform different from the build platform, you should specify the |
394 | 283 | "host" platform (i.e., that on which the generated programs will | 281 | "host" platform (i.e., that on which the generated programs will |
396 | 284 | eventually be run) with `--host=TYPE'. | 282 | eventually be run) with '--host=TYPE'. |
397 | 285 | 283 | ||
398 | 286 | Sharing Defaults | 284 | Sharing Defaults |
399 | 287 | ================ | 285 | ================ |
400 | 288 | 286 | ||
408 | 289 | If you want to set default values for `configure' scripts to share, | 287 | If you want to set default values for 'configure' scripts to share, |
409 | 290 | you can create a site shell script called `config.site' that gives | 288 | you can create a site shell script called 'config.site' that gives |
410 | 291 | default values for variables like `CC', `cache_file', and `prefix'. | 289 | default values for variables like 'CC', 'cache_file', and 'prefix'. |
411 | 292 | `configure' looks for `PREFIX/share/config.site' if it exists, then | 290 | 'configure' looks for 'PREFIX/share/config.site' if it exists, then |
412 | 293 | `PREFIX/etc/config.site' if it exists. Or, you can set the | 291 | 'PREFIX/etc/config.site' if it exists. Or, you can set the |
413 | 294 | `CONFIG_SITE' environment variable to the location of the site script. | 292 | 'CONFIG_SITE' environment variable to the location of the site script. |
414 | 295 | A warning: not all `configure' scripts look for a site script. | 293 | A warning: not all 'configure' scripts look for a site script. |
415 | 296 | 294 | ||
416 | 297 | Defining Variables | 295 | Defining Variables |
417 | 298 | ================== | 296 | ================== |
418 | 299 | 297 | ||
419 | 300 | Variables not defined in a site shell script can be set in the | 298 | Variables not defined in a site shell script can be set in the |
421 | 301 | environment passed to `configure'. However, some packages may run | 299 | environment passed to 'configure'. However, some packages may run |
422 | 302 | configure again during the build, and the customized values of these | 300 | configure again during the build, and the customized values of these |
423 | 303 | variables may be lost. In order to avoid this problem, you should set | 301 | variables may be lost. In order to avoid this problem, you should set |
425 | 304 | them in the `configure' command line, using `VAR=value'. For example: | 302 | them in the 'configure' command line, using 'VAR=value'. For example: |
426 | 305 | 303 | ||
427 | 306 | ./configure CC=/usr/local2/bin/gcc | 304 | ./configure CC=/usr/local2/bin/gcc |
428 | 307 | 305 | ||
430 | 308 | causes the specified `gcc' to be used as the C compiler (unless it is | 306 | causes the specified 'gcc' to be used as the C compiler (unless it is |
431 | 309 | overridden in the site shell script). | 307 | overridden in the site shell script). |
432 | 310 | 308 | ||
436 | 311 | Unfortunately, this technique does not work for `CONFIG_SHELL' due to | 309 | Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an |
437 | 312 | an Autoconf limitation. Until the limitation is lifted, you can use | 310 | Autoconf limitation. Until the limitation is lifted, you can use this |
438 | 313 | this workaround: | 311 | workaround: |
439 | 314 | 312 | ||
440 | 315 | CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash | 313 | CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash |
441 | 316 | 314 | ||
443 | 317 | `configure' Invocation | 315 | 'configure' Invocation |
444 | 318 | ====================== | 316 | ====================== |
445 | 319 | 317 | ||
447 | 320 | `configure' recognizes the following options to control how it | 318 | 'configure' recognizes the following options to control how it |
448 | 321 | operates. | 319 | operates. |
449 | 322 | 320 | ||
453 | 323 | `--help' | 321 | '--help' |
454 | 324 | `-h' | 322 | '-h' |
455 | 325 | Print a summary of all of the options to `configure', and exit. | 323 | Print a summary of all of the options to 'configure', and exit. |
456 | 326 | 324 | ||
459 | 327 | `--help=short' | 325 | '--help=short' |
460 | 328 | `--help=recursive' | 326 | '--help=recursive' |
461 | 329 | Print a summary of the options unique to this package's | 327 | Print a summary of the options unique to this package's |
465 | 330 | `configure', and exit. The `short' variant lists options used | 328 | 'configure', and exit. The 'short' variant lists options used only |
466 | 331 | only in the top level, while the `recursive' variant lists options | 329 | in the top level, while the 'recursive' variant lists options also |
467 | 332 | also present in any nested packages. | 330 | present in any nested packages. |
468 | 333 | 331 | ||
472 | 334 | `--version' | 332 | '--version' |
473 | 335 | `-V' | 333 | '-V' |
474 | 336 | Print the version of Autoconf used to generate the `configure' | 334 | Print the version of Autoconf used to generate the 'configure' |
475 | 337 | script, and exit. | 335 | script, and exit. |
476 | 338 | 336 | ||
478 | 339 | `--cache-file=FILE' | 337 | '--cache-file=FILE' |
479 | 340 | Enable the cache: use and save the results of the tests in FILE, | 338 | Enable the cache: use and save the results of the tests in FILE, |
481 | 341 | traditionally `config.cache'. FILE defaults to `/dev/null' to | 339 | traditionally 'config.cache'. FILE defaults to '/dev/null' to |
482 | 342 | disable caching. | 340 | disable caching. |
483 | 343 | 341 | ||
487 | 344 | `--config-cache' | 342 | '--config-cache' |
488 | 345 | `-C' | 343 | '-C' |
489 | 346 | Alias for `--cache-file=config.cache'. | 344 | Alias for '--cache-file=config.cache'. |
490 | 347 | 345 | ||
494 | 348 | `--quiet' | 346 | '--quiet' |
495 | 349 | `--silent' | 347 | '--silent' |
496 | 350 | `-q' | 348 | '-q' |
497 | 351 | Do not print messages saying which checks are being made. To | 349 | Do not print messages saying which checks are being made. To |
499 | 352 | suppress all normal output, redirect it to `/dev/null' (any error | 350 | suppress all normal output, redirect it to '/dev/null' (any error |
500 | 353 | messages will still be shown). | 351 | messages will still be shown). |
501 | 354 | 352 | ||
503 | 355 | `--srcdir=DIR' | 353 | '--srcdir=DIR' |
504 | 356 | Look for the package's source code in directory DIR. Usually | 354 | Look for the package's source code in directory DIR. Usually |
506 | 357 | `configure' can determine that directory automatically. | 355 | 'configure' can determine that directory automatically. |
507 | 358 | 356 | ||
512 | 359 | `--prefix=DIR' | 357 | '--prefix=DIR' |
513 | 360 | Use DIR as the installation prefix. *note Installation Names:: | 358 | Use DIR as the installation prefix. *note Installation Names:: for |
514 | 361 | for more details, including other options available for fine-tuning | 359 | more details, including other options available for fine-tuning the |
515 | 362 | the installation locations. | 360 | installation locations. |
516 | 363 | 361 | ||
519 | 364 | `--no-create' | 362 | '--no-create' |
520 | 365 | `-n' | 363 | '-n' |
521 | 366 | Run the configure checks, but stop before creating any output | 364 | Run the configure checks, but stop before creating any output |
522 | 367 | files. | 365 | files. |
523 | 368 | 366 | ||
526 | 369 | `configure' also accepts some other, not widely useful, options. Run | 367 | 'configure' also accepts some other, not widely useful, options. Run |
527 | 370 | `configure --help' for more details. | 368 | 'configure --help' for more details. |
528 | diff --git a/config.h.in b/config.h.in | |||
529 | index bcdf201..fb9979f 100644 | |||
530 | --- a/config.h.in | |||
531 | +++ b/config.h.in | |||
532 | @@ -15,6 +15,14 @@ | |||
533 | 15 | /* Define to 1 if you have the `bind_textdomain_codeset' function. */ | 15 | /* Define to 1 if you have the `bind_textdomain_codeset' function. */ |
534 | 16 | #undef HAVE_BIND_TEXTDOMAIN_CODESET | 16 | #undef HAVE_BIND_TEXTDOMAIN_CODESET |
535 | 17 | 17 | ||
536 | 18 | /* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the | ||
537 | 19 | CoreFoundation framework. */ | ||
538 | 20 | #undef HAVE_CFLOCALECOPYCURRENT | ||
539 | 21 | |||
540 | 22 | /* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in | ||
541 | 23 | the CoreFoundation framework. */ | ||
542 | 24 | #undef HAVE_CFPREFERENCESCOPYAPPVALUE | ||
543 | 25 | |||
544 | 18 | /* Define to 1 if you have the `dcgettext' function. */ | 26 | /* Define to 1 if you have the `dcgettext' function. */ |
545 | 19 | #undef HAVE_DCGETTEXT | 27 | #undef HAVE_DCGETTEXT |
546 | 20 | 28 | ||
547 | diff --git a/data/apt_check.py b/data/apt_check.py | |||
548 | index 6bb716f..ed729c9 100755 | |||
549 | --- a/data/apt_check.py | |||
550 | +++ b/data/apt_check.py | |||
551 | @@ -68,8 +68,8 @@ def isESMUpgrade(ver): | |||
552 | 68 | 68 | ||
553 | 69 | def write_package_names(outstream, cache, depcache): | 69 | def write_package_names(outstream, cache, depcache): |
554 | 70 | " write out package names that change to outstream " | 70 | " write out package names that change to outstream " |
557 | 71 | pkgs = [pkg for pkg in cache.packages if depcache.marked_install(pkg) or | 71 | pkgs = [pkg for pkg in cache.packages if depcache.marked_install(pkg) |
558 | 72 | depcache.marked_upgrade(pkg)] | 72 | or depcache.marked_upgrade(pkg)] |
559 | 73 | outstream.write("\n".join([p.name for p in pkgs])) | 73 | outstream.write("\n".join([p.name for p in pkgs])) |
560 | 74 | 74 | ||
561 | 75 | 75 | ||
562 | @@ -90,8 +90,10 @@ def write_human_readable_summary(outstream, upgrades, security_updates, | |||
563 | 90 | outstream.write("\n\n") | 90 | outstream.write("\n\n") |
564 | 91 | 91 | ||
565 | 92 | outstream.write(gettext.dngettext("update-notifier", | 92 | outstream.write(gettext.dngettext("update-notifier", |
568 | 93 | "%i package can be updated.", | 93 | "%i update can be installed " |
569 | 94 | "%i packages can be updated.", | 94 | "immediately.", |
570 | 95 | "%i updates can be installed " | ||
571 | 96 | "immediately.", | ||
572 | 95 | upgrades) % upgrades) | 97 | upgrades) % upgrades) |
573 | 96 | outstream.write("\n") | 98 | outstream.write("\n") |
574 | 97 | if esm_updates > 0: | 99 | if esm_updates > 0: |
575 | @@ -228,8 +230,8 @@ def run(options=None): | |||
576 | 228 | disabled_esm_updates += 1 | 230 | disabled_esm_updates += 1 |
577 | 229 | 231 | ||
578 | 230 | # skip packages that are not marked upgraded/installed | 232 | # skip packages that are not marked upgraded/installed |
581 | 231 | if not (depcache.marked_install(pkg) or | 233 | if not (depcache.marked_install(pkg) |
582 | 232 | depcache.marked_upgrade(pkg)): | 234 | or depcache.marked_upgrade(pkg)): |
583 | 233 | continue | 235 | continue |
584 | 234 | # check if this is really a upgrade or a false positive | 236 | # check if this is really a upgrade or a false positive |
585 | 235 | # (workaround for ubuntu #7907) | 237 | # (workaround for ubuntu #7907) |
586 | @@ -262,10 +264,9 @@ def run(options=None): | |||
587 | 262 | # now check for security updates that are masked by a | 264 | # now check for security updates that are masked by a |
588 | 263 | # candidate version from another repo (-proposed or -updates) | 265 | # candidate version from another repo (-proposed or -updates) |
589 | 264 | for ver in pkg.version_list: | 266 | for ver in pkg.version_list: |
594 | 265 | if (inst_ver and apt_pkg.version_compare(ver.ver_str, | 267 | if (inst_ver |
595 | 266 | inst_ver.ver_str) <= | 268 | and apt_pkg.version_compare(ver.ver_str, |
596 | 267 | 0): | 269 | inst_ver.ver_str) <= 0): |
593 | 268 | # print("skipping '%s' " % ver.VerStr) | ||
597 | 269 | continue | 270 | continue |
598 | 270 | if isESMUpgrade(ver): | 271 | if isESMUpgrade(ver): |
599 | 271 | esm_updates += 1 | 272 | esm_updates += 1 |
600 | diff --git a/data/hooks.py b/data/hooks.py | |||
601 | index 5585e33..034852c 100755 | |||
602 | --- a/data/hooks.py | |||
603 | +++ b/data/hooks.py | |||
604 | @@ -75,7 +75,7 @@ class HookFiles(object): | |||
605 | 75 | # we last saw it | 75 | # we last saw it |
606 | 76 | h = self._hooks[hook] | 76 | h = self._hooks[hook] |
607 | 77 | if os.stat(self.hookDir + hook).st_mtime > int(h.mtime): | 77 | if os.stat(self.hookDir + hook).st_mtime > int(h.mtime): |
609 | 78 | h.seen = False | 78 | h.seen = False |
610 | 79 | else: | 79 | else: |
611 | 80 | self._hooks[hook] = self.HookFile(hook) | 80 | self._hooks[hook] = self.HookFile(hook) |
612 | 81 | 81 | ||
613 | diff --git a/data/package-data-downloader b/data/package-data-downloader | |||
614 | index f7d8566..00b4aff 100755 | |||
615 | --- a/data/package-data-downloader | |||
616 | +++ b/data/package-data-downloader | |||
617 | @@ -160,8 +160,8 @@ def get_hook_file_names(): | |||
618 | 160 | res = [] | 160 | res = [] |
619 | 161 | for relfile in os.listdir(DATADIR): | 161 | for relfile in os.listdir(DATADIR): |
620 | 162 | # ignore files ending in .dpkg-* | 162 | # ignore files ending in .dpkg-* |
623 | 163 | if (os.path.splitext(relfile)[1] and | 163 | if (os.path.splitext(relfile)[1] |
624 | 164 | os.path.splitext(relfile)[1].startswith(".dpkg")): | 164 | and os.path.splitext(relfile)[1].startswith(".dpkg")): |
625 | 165 | continue | 165 | continue |
626 | 166 | res.append(relfile) | 166 | res.append(relfile) |
627 | 167 | return res | 167 | return res |
628 | diff --git a/debian/changelog b/debian/changelog | |||
629 | index b688483..6f198c7 100644 | |||
630 | --- a/debian/changelog | |||
631 | +++ b/debian/changelog | |||
632 | @@ -1,3 +1,18 @@ | |||
633 | 1 | <<<<<<< debian/changelog | ||
634 | 2 | ======= | ||
635 | 3 | update-notifier (3.192.1.9) bionic; urgency=medium | ||
636 | 4 | |||
637 | 5 | [ Gianfranco Costamagna ] | ||
638 | 6 | * Fix E117 over-indented pep issues. | ||
639 | 7 | |||
640 | 8 | [ Andrea Azzarone ] | ||
641 | 9 | * data/apt_check.py, data/package-data-downloader, tests/test_pep8.py: | ||
642 | 10 | - update the code formating to be not hit W504 warnings, | ||
643 | 11 | change to ignore W503 and be consistent with update-manager. | ||
644 | 12 | |||
645 | 13 | -- Chad Smith <chad.smith@canonical.com> Tue, 16 Oct 2020 15:35:29 -0600 | ||
646 | 14 | |||
647 | 15 | >>>>>>> debian/changelog | ||
648 | 1 | update-notifier (3.192.1.8) bionic; urgency=medium | 16 | update-notifier (3.192.1.8) bionic; urgency=medium |
649 | 2 | 17 | ||
650 | 3 | [ Andreas Hasenack ] | 18 | [ Andreas Hasenack ] |
651 | diff --git a/tests/test_package-data-downloader.py b/tests/test_package-data-downloader.py | |||
652 | index 8680d4c..9c7e53c 100644 | |||
653 | --- a/tests/test_package-data-downloader.py | |||
654 | +++ b/tests/test_package-data-downloader.py | |||
655 | @@ -123,7 +123,7 @@ class ProcessDownloadRequestsTestCase(unittest.TestCase): | |||
656 | 123 | stampfile = os.path.join(package_data_downloader.STAMPDIR, | 123 | stampfile = os.path.join(package_data_downloader.STAMPDIR, |
657 | 124 | hookfile) | 124 | hookfile) |
658 | 125 | with open(stampfile, "w"): | 125 | with open(stampfile, "w"): |
660 | 126 | pass | 126 | pass |
661 | 127 | orig_stamp_time = os.stat(stampfile).st_mtime | 127 | orig_stamp_time = os.stat(stampfile).st_mtime |
662 | 128 | package_data_downloader.process_download_requests() | 128 | package_data_downloader.process_download_requests() |
663 | 129 | new_stamp_time = os.stat(stampfile).st_mtime | 129 | new_stamp_time = os.stat(stampfile).st_mtime |
664 | @@ -141,7 +141,7 @@ class ProcessDownloadRequestsTestCase(unittest.TestCase): | |||
665 | 141 | stampfile = os.path.join(package_data_downloader.STAMPDIR, | 141 | stampfile = os.path.join(package_data_downloader.STAMPDIR, |
666 | 142 | hookfile) | 142 | hookfile) |
667 | 143 | with open(stampfile, "w"): | 143 | with open(stampfile, "w"): |
669 | 144 | pass | 144 | pass |
670 | 145 | orig_stamp_date = os.stat(stampfile).st_mtime | 145 | orig_stamp_date = os.stat(stampfile).st_mtime |
671 | 146 | time.sleep(0.01) | 146 | time.sleep(0.01) |
672 | 147 | # create the hook file | 147 | # create the hook file |
673 | @@ -191,7 +191,7 @@ class ProcessDownloadRequestsTestCase(unittest.TestCase): | |||
674 | 191 | stampfile = os.path.join(package_data_downloader.STAMPDIR, | 191 | stampfile = os.path.join(package_data_downloader.STAMPDIR, |
675 | 192 | hookfile) | 192 | hookfile) |
676 | 193 | with open(stampfile, "w"): | 193 | with open(stampfile, "w"): |
678 | 194 | pass | 194 | pass |
679 | 195 | time.sleep(0.01) | 195 | time.sleep(0.01) |
680 | 196 | # create the hook file | 196 | # create the hook file |
681 | 197 | self._setup_hook_file(hookfile, "/bin/false") | 197 | self._setup_hook_file(hookfile, "/bin/false") |
682 | @@ -207,7 +207,7 @@ class ProcessDownloadRequestsTestCase(unittest.TestCase): | |||
683 | 207 | stampfile = os.path.join(package_data_downloader.STAMPDIR, | 207 | stampfile = os.path.join(package_data_downloader.STAMPDIR, |
684 | 208 | hookfile) | 208 | hookfile) |
685 | 209 | with open(stampfile, "w"): | 209 | with open(stampfile, "w"): |
687 | 210 | pass | 210 | pass |
688 | 211 | time.sleep(0.01) | 211 | time.sleep(0.01) |
689 | 212 | self._setup_hook_file(hookfile) | 212 | self._setup_hook_file(hookfile) |
690 | 213 | # create an empty notifier file | 213 | # create an empty notifier file |
691 | @@ -222,7 +222,7 @@ class ProcessDownloadRequestsTestCase(unittest.TestCase): | |||
692 | 222 | stampfile = os.path.join(package_data_downloader.STAMPDIR, | 222 | stampfile = os.path.join(package_data_downloader.STAMPDIR, |
693 | 223 | hookfile) | 223 | hookfile) |
694 | 224 | with open(stampfile, "w"): | 224 | with open(stampfile, "w"): |
696 | 225 | pass | 225 | pass |
697 | 226 | time.sleep(0.01) | 226 | time.sleep(0.01) |
698 | 227 | self._setup_hook_file(hookfile) | 227 | self._setup_hook_file(hookfile) |
699 | 228 | # create empty notifier files | 228 | # create empty notifier files |
700 | @@ -241,7 +241,7 @@ class ProcessDownloadRequestsTestCase(unittest.TestCase): | |||
701 | 241 | stampfile = os.path.join(package_data_downloader.STAMPDIR, | 241 | stampfile = os.path.join(package_data_downloader.STAMPDIR, |
702 | 242 | hookfile) | 242 | hookfile) |
703 | 243 | with open(stampfile, "w"): | 243 | with open(stampfile, "w"): |
705 | 244 | pass | 244 | pass |
706 | 245 | time.sleep(0.01) | 245 | time.sleep(0.01) |
707 | 246 | self._setup_hook_file(hookfile) | 246 | self._setup_hook_file(hookfile) |
708 | 247 | # create an empty permanent notifier file | 247 | # create an empty permanent notifier file |
709 | @@ -257,7 +257,7 @@ class ProcessDownloadRequestsTestCase(unittest.TestCase): | |||
710 | 257 | stampfile = os.path.join(package_data_downloader.STAMPDIR, | 257 | stampfile = os.path.join(package_data_downloader.STAMPDIR, |
711 | 258 | hookfile) | 258 | hookfile) |
712 | 259 | with open(stampfile, "w"): | 259 | with open(stampfile, "w"): |
714 | 260 | pass | 260 | pass |
715 | 261 | time.sleep(0.01) | 261 | time.sleep(0.01) |
716 | 262 | # overwrite canary file to create a failure | 262 | # overwrite canary file to create a failure |
717 | 263 | self.canary_file = "not-there.txt" | 263 | self.canary_file = "not-there.txt" |
718 | diff --git a/tests/test_pep8.py b/tests/test_pep8.py | |||
719 | index fa6c416..96f68c0 100644 | |||
720 | --- a/tests/test_pep8.py | |||
721 | +++ b/tests/test_pep8.py | |||
722 | @@ -6,7 +6,7 @@ import subprocess | |||
723 | 6 | import unittest | 6 | import unittest |
724 | 7 | 7 | ||
725 | 8 | # pep8 is overdoing it a bit IMO | 8 | # pep8 is overdoing it a bit IMO |
727 | 9 | IGNORE_PEP8 = "E265" | 9 | IGNORE_PEP8 = "E265, W503" |
728 | 10 | IGNORE_FILES = ( | 10 | IGNORE_FILES = ( |
729 | 11 | ) | 11 | ) |
730 | 12 | 12 |