Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
X
xpub-epmc
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package Registry
Container Registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Insights
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Literature-services
public-projects
xpub-epmc
Commits
e9371474
Commit
e9371474
authored
6 years ago
by
Nikos Marinos
Browse files
Options
Downloads
Patches
Plain Diff
bug fixes on tagger import
parent
01541f74
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!102
Shared data model
,
!103
Dev
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
server/utils/files.js
+4
-1
4 additions, 1 deletion
server/utils/files.js
server/utils/unTar.js
+1
-3
1 addition, 3 deletions
server/utils/unTar.js
with
5 additions
and
4 deletions
server/utils/files.js
+
4
−
1
View file @
e9371474
...
...
@@ -14,11 +14,14 @@ module.exports.getManifestFilename = function getManifestFilename(tmpPath) {
return
new
Promise
((
resolve
,
reject
)
=>
{
fs
.
readdir
(
tmpPath
,
(
err
,
items
)
=>
{
if
(
err
)
reject
(
err
)
let
manifestExists
=
false
for
(
let
i
=
0
;
i
<
items
.
length
;
i
+=
1
)
{
if
(
items
[
i
].
indexOf
(
'
manifest
'
)
>
-
1
)
{
resolve
(
items
[
i
])
}
else
reject
(
new
Error
(
'
There is no manifest file.
'
))
manifestExists
=
true
}
}
if
(
!
manifestExists
)
reject
(
new
Error
(
'
There is no manifest file.
'
))
})
})
}
...
...
This diff is collapsed.
Click to expand it.
server/utils/unTar.js
+
1
−
3
View file @
e9371474
...
...
@@ -15,9 +15,7 @@ module.exports.untar = function untar(source, dest) {
}
fs
.
readdir
(
dest
,
(
err
,
items
)
=>
{
if
(
err
)
reject
(
err
)
// resolve(`${dest}/${items[0]}`)
// this works in beta:
resolve
(
`
${
dest
}
`
)
resolve
(
`
${
dest
}
/
${
items
[
0
]}
`
)
})
},
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
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