Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
J
javatools
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Debian Java Maintainers
javatools
Commits
a87bc535
Unverified
Commit
a87bc535
authored
6 years ago
by
Niels Thykier
Browse files
Options
Downloads
Patches
Plain Diff
jh_linkjars: Fix bug with multiple dep fields and newlines
Signed-off-by:
Niels Thykier
<
niels@thykier.net
>
parent
c8e55527
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
debian/changelog
+2
-0
2 additions, 0 deletions
debian/changelog
jh_linkjars
+5
-3
5 additions, 3 deletions
jh_linkjars
with
7 additions
and
3 deletions
debian/changelog
+
2
−
0
View file @
a87bc535
javatools (0.67) UNRELEASED; urgency=medium
* jh_installibs: Fix error when jar file symlink already exist.
* jh_linkjars: Handle multiple dependency fields and newlines in
them more gracefully.
-- Niels Thykier <niels@thykier.net> Fri, 21 Sep 2018 16:02:23 +0000
...
...
This diff is collapsed.
Click to expand it.
jh_linkjars
+
5
−
3
View file @
a87bc535
...
...
@@ -73,11 +73,13 @@ init(options => {
sub
parse_deps_fields
{
my
(
$field
)
=
@_
;
my
@packages
;
$field
=~
s/^\s++//
;
$field
=~
s/\s++$//
;
$field
=~
s/\r?\n/,/g
;
$field
=~
s/^\s*+,?//
;
$field
=~
s/,?\s*+$//
;
for
my
$clause
(
split
(
m/\s*+[,|]\s*+/
,
$field
))
{
next
if
$clause
=~
m/^\s*$/
;
# Drop everything after [, ( or <.
$clause
=~
s/\s*+[
\(\[\<
].*$//
;
$clause
=~
s/\s*+[
[<(
].*$//
;
push
(
@packages
,
$clause
);
}
return
@packages
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment