Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-advanced-user-tools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue 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
caosdb
Software
caosdb-advanced-user-tools
Commits
c305bdc1
Commit
c305bdc1
authored
2 years ago
by
Florian Spreckelsen
Browse files
Options
Downloads
Plain Diff
Merge branch 'f-log' into 'dev'
F log See merge request
!68
parents
ddb10dcd
acda4d7b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!69
Release v0.7.0
,
!68
F log
Pipeline
#34424
passed
2 years ago
Stage: setup
Stage: cert
Stage: style
Stage: unittest
Stage: integrationtest
Changes
1
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/caosadvancedtools/loadFiles.py
+4
-2
4 additions, 2 deletions
src/caosadvancedtools/loadFiles.py
with
4 additions
and
2 deletions
src/caosadvancedtools/loadFiles.py
+
4
−
2
View file @
c305bdc1
...
...
@@ -175,8 +175,6 @@ def loadpath(path, include, exclude, prefix, dryrun, forceAllowSymlinks, caosdbi
for
f
in
files
:
totalsize
+=
f
.
size
print
(
"
Made in total {} new files with a combined size of {}
"
"
accessible.
"
.
format
(
len
(
files
),
convert_size
(
totalsize
)))
logger
.
info
(
"
Made in total {} new files with a combined size of {}
"
"
accessible.
"
.
format
(
len
(
files
),
convert_size
(
totalsize
)))
...
...
@@ -249,6 +247,10 @@ exclude is given preference over include.
raise
ValueError
(
"
Do not use a localpath and in- or exclude simultaneously!
"
)
# configure logging
logger
.
addHandler
(
logging
.
StreamHandler
(
stream
=
sys
.
stdout
))
logger
.
setLevel
(
logging
.
INFO
)
con
=
db
.
get_connection
()
con
.
timeout
=
float
(
args
.
timeout
)
con
.
_login
()
...
...
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