Ansgar pushed to branch master at Debian FTP Team / dak
Commits:
-
916a8910
by Matthias Klumpp at 2020-11-28T03:55:18+01:00
-
326d0203
by Ansgar at 2020-12-02T20:26:50+01:00
-
9832f1ef
by Ansgar at 2020-12-02T20:27:56+01:00
-
80e63881
by Ansgar at 2020-12-02T20:28:33+01:00
2 changed files:
Changes:
| ... | ... | @@ -43,11 +43,6 @@ import apt_pkg |
| 43 | 43 |
import datetime
|
| 44 | 44 |
import functools
|
| 45 | 45 |
|
| 46 |
-try:
|
|
| 47 |
- import rrdtool
|
|
| 48 |
-except ImportError:
|
|
| 49 |
- pass
|
|
| 50 |
- |
|
| 51 | 46 |
from daklib import utils
|
| 52 | 47 |
from daklib.utils import get_logins_from_ldap
|
| 53 | 48 |
from daklib.dbconn import DBConn, has_new_comment, PolicyQueue, get_uid_from_fingerprint
|
| ... | ... | @@ -353,6 +348,8 @@ def update_graph_database(rrd_dir, type, n_source, n_binary): |
| 353 | 348 |
if not rrd_dir:
|
| 354 | 349 |
return
|
| 355 | 350 |
|
| 351 |
+ import rrdtool
|
|
| 352 |
+ |
|
| 356 | 353 |
rrd_file = os.path.join(rrd_dir, type.lower() + '.rrd')
|
| 357 | 354 |
update = [rrd_file, "N:%s:%s" % (n_source, n_binary)]
|
| 358 | 355 |
|
| ... | ... | @@ -116,6 +116,9 @@ def validate_data(data): |
| 116 | 116 |
ret = False
|
| 117 | 117 |
continue
|
| 118 | 118 |
if not pkgname:
|
| 119 |
+ if doc.get('Merge'):
|
|
| 120 |
+ # merge instructions do not need a package name
|
|
| 121 |
+ continue
|
|
| 119 | 122 |
if cpttype not in ['web-application', 'operating-system', 'repository']:
|
| 120 | 123 |
add_issue('[%s]: %s' % (cptid, 'Component is missing a \'Package\' key.'))
|
| 121 | 124 |
ret = False
|