File tree Expand file tree Collapse file tree 2 files changed +12
-9
lines changed Expand file tree Collapse file tree 2 files changed +12
-9
lines changed Original file line number Diff line number Diff line change 1
- # Copyright (c) 2020, Oracle and/or its affiliates.
1
+ # Copyright (c) 2020, 2021, Oracle and/or its affiliates.
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License, version 2.0, as
@@ -255,10 +255,13 @@ def _populate_debian(self):
255
255
"" .format (copyright_file ))
256
256
with open (copyright_file , "r" ) as fp :
257
257
# Skip to line just before the text we want to copy
258
- while not fp .readline ().startswith ("License: Commercial" ):
259
- continue
260
- # Read the rest of the text (add a space before each line)
261
- lic_text = fp .read ()
258
+ while True :
259
+ line = fp .readline ()
260
+ if not line :
261
+ break
262
+ if line .startswith ("License: Commercial" ):
263
+ # Read the rest of the text
264
+ lic_text = fp .read ()
262
265
263
266
with open (control_file , "r" ) as fp :
264
267
control_text = fp .read ()
Original file line number Diff line number Diff line change 30
30
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
31
31
32
32
export DH_VERBOSE = 1
33
+ export PYBUILD_DISABLE =test
33
34
export PYBUILD_DISABLE_python2 =1
34
35
35
36
PY3_BUILD_LIB_OPT = --build-lib=build/python3
82
83
% :
83
84
dh $@ --with python3 --buildsystem=pybuild
84
85
85
- override_dh_auto_test :
86
- echo " skipping test"
87
-
88
86
override_dh_auto_install :
89
87
90
88
set -xe; \
@@ -104,7 +102,9 @@ override_dh_auto_install:
104
102
done
105
103
106
104
override_dh_python3 :
107
- dh_python3 --no-ext-rename
105
+ ifeq ($(BYTE_CODE_ONLY ) ,)
106
+ py3clean .
107
+ endif
108
108
109
109
ifneq ($(BYTE_CODE_ONLY ) ,)
110
110
override_dh_pysupport :
You can’t perform that action at this time.
0 commit comments