Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Anders Blomdell
hash_backup
Commits
731d346b
Commit
731d346b
authored
Nov 09, 2016
by
Anders Blomdell
Browse files
Add path when dealing with changed files...
parent
b778cecc
Changes
1
Hide whitespace changes
Inline
Side-by-side
secondary.py
View file @
731d346b
...
@@ -68,28 +68,29 @@ class Backup:
...
@@ -68,28 +68,29 @@ class Backup:
def
check
(
self
,
src
,
dst
):
def
check
(
self
,
src
,
dst
):
if
src
.
name
!=
dst
.
name
:
if
src
.
name
!=
dst
.
name
:
raise
Exception
(
'Names differ: %s, %s'
%
(
src
,
dst
))
raise
Exception
(
'Names differ: %s, %s'
%
(
src
,
dst
))
dst_path
=
os
.
path
.
join
(
self
.
dst_root
,
dst
.
name
)
if
src
.
kind
!=
dst
.
kind
or
src
.
md5
!=
dst
.
md5
or
src
.
size
!=
dst
.
size
:
if
src
.
kind
!=
dst
.
kind
or
src
.
md5
!=
dst
.
md5
or
src
.
size
!=
dst
.
size
:
self
.
log
.
DEBUG
(
'Replace...'
,
src
.
name
,
dst
.
name
,
self
.
log
.
DEBUG
(
'Replace...'
,
src
.
name
,
dst
.
name
,
src
.
md5
,
dst
.
md5
,
src
.
size
,
dst
.
size
)
src
.
md5
,
dst
.
md5
,
src
.
size
,
dst
.
size
)
self
.
status
.
replaced
+=
1
self
.
status
.
replaced
+=
1
self
.
delete
(
dst
)
self
.
delete
(
dst
)
self
.
add
(
src
)
self
.
add
(
src
)
elif
os
.
path
.
exists
(
dst
.
name
):
elif
os
.
path
.
exists
(
dst
_path
):
changed
=
False
changed
=
False
if
src
.
kind
in
[
'F'
,
'D'
]
and
src
.
mode
!=
dst
.
mode
:
if
src
.
kind
in
[
b
'F'
,
b
'D'
]
and
src
.
mode
!=
dst
.
mode
:
self
.
log
.
DEBUG
(
'MODE'
,
dst
.
name
,
src
.
mode
,
dst
.
mode
)
self
.
log
.
DEBUG
(
'MODE'
,
dst
.
name
,
src
.
mode
,
dst
.
mode
)
os
.
chmod
(
dst
.
name
,
int
(
src
.
mode
,
8
))
os
.
chmod
(
dst
_path
,
int
(
src
.
mode
,
8
))
changed
=
True
changed
=
True
if
(
src
.
kind
in
[
'F'
,
'D'
]
and
if
(
src
.
kind
in
[
b
'F'
,
b
'D'
]
and
src
.
uid
!=
dst
.
uid
or
src
.
gid
!=
dst
.
gid
):
(
src
.
uid
!=
dst
.
uid
or
src
.
gid
!=
dst
.
gid
)
)
:
self
.
log
.
DEBUG
(
'UID/GID'
,
dst
.
name
,
src
.
uid
,
src
.
gid
,
self
.
log
.
DEBUG
(
'UID/GID'
,
dst
.
name
,
src
.
uid
,
src
.
gid
,
dst
.
uid
,
dst
.
gid
)
dst
.
uid
,
dst
.
gid
)
os
.
lchown
(
dst
.
name
,
int
(
src
.
uid
),
int
(
src
.
gid
))
os
.
lchown
(
dst
_path
,
int
(
src
.
uid
),
int
(
src
.
gid
))
changed
=
True
changed
=
True
if
src
.
kind
==
'F'
and
src
.
mtime
!=
dst
.
mtime
:
if
src
.
kind
==
b
'F'
and
src
.
mtime
!=
dst
.
mtime
:
self
.
log
.
DEBUG
(
'MTIME'
,
src
.
name
,
src
.
mtime
,
dst
.
mtime
)
self
.
log
.
DEBUG
(
'MTIME'
,
src
.
name
,
src
.
mtime
,
dst
.
mtime
)
atime
=
os
.
stat
(
dst
.
name
).
st_atime
atime
=
os
.
stat
(
dst
_path
).
st_atime
os
.
utime
(
dst
.
name
,
(
int
(
atime
),
int
(
src
.
mtime
)))
os
.
utime
(
dst
_path
,
(
int
(
atime
),
int
(
src
.
mtime
)))
changed
=
True
changed
=
True
if
changed
:
if
changed
:
self
.
status
.
metadata
+=
1
self
.
status
.
metadata
+=
1
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment