Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
slapos
Commits
0af6e19a
Commit
0af6e19a
authored
Jun 12, 2023
by
Boxiang Sun
Committed by
Thomas Gambier
Feb 28, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rdiff-backup: Update the patch
parent
407b7d8b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
38 deletions
+14
-38
component/rdiff-backup/rdiff-backup-2.2.4-ignore-numerical-ids-1.0.0.patch
...ackup/rdiff-backup-2.2.4-ignore-numerical-ids-1.0.0.patch
+14
-38
No files found.
component/rdiff-backup/rdiff-backup-2.2.4-ignore-numerical-ids-1.0.0.patch
View file @
0af6e19a
diff -Naur src/rdiff_backup/Globals.py src/rdiff_backup/Globals.py
--- src/rdiff_backup/Globals.py 2023-02-27 07:45:09.000000000 +0100
+++ src/rdiff_backup/Globals.py 2023-05-11 16:02:08.544025324 +0200
@@ -291,6 +291,9 @@
# Protocol 4 is understood since Python 3.4, protocol 5 since 3.8.
PICKLE_PROTOCOL = 4
+# If set, don't compare uid/gid or uname/gname when comparing
+# two RORPath
+ignore_numerical_ids = None
# @API(get, 200)
def get(name):
diff -Naur src/rdiff_backup/rpath.py src/rdiff_backup/rpath.py
--- src/rdiff_backup/rpath.py 2023-02-27 07:45:09.000000000 +0100
+++ src/rdiff_backup/rpath.py 2023-05-11 16:38:06.011273968 +0200
@@ -592,6 +592,7 @@
and (self.issym() or not compare_ownership)):
# Don't compare gid/uid for symlinks, or if told not to
pass
+ elif key in ('uid', 'gid', 'uname', 'gname') and Globals.ignore_numerical_ids: pass
elif key == 'type' and not compare_type:
pass
elif key == 'atime' and not Globals.preserve_atime:
diff -Naur src/rdiffbackup/actions/__init__.py src/rdiffbackup/actions/__init__.py
--- src/rdiffbackup/actions/__init__.py 2023-02-27 07:45:09.000000000 +0100
+++ src/rdiffbackup/actions/__init__.py 2023-0
5-11 16:25:36.095180254
+0200
@@ -
55,6 +55
,9 @@
"--
api-version", type=int
,
help="[opt]
integer to set the API version forcefully used
")
+++ src/rdiffbackup/actions/__init__.py 2023-0
6-07 16:38:33.705533987
+0200
@@ -
64,6 +64
,9 @@
"--
fsync", default=True, action=BooleanOptionalAction
,
help="[opt]
do (or not) often sync the file system (_not_ doing it is faster but can be dangerous)
")
COMMON_PARSER.add_argument(
+ "--
ignore-numerical-ids", type=int
,
+ help="[opt]
integer to set the numerical ids
")
+ "--
change-ownership", action="store_true"
,
+ help="[opt]
change (or not) target's uid/gid
")
+COMMON_PARSER.add_argument(
"--
current-time", type=int
,
help="[opt]
fake the current time in seconds (for testing)
")
"--
null-separator", action="store_true"
,
help="[opt]
use null instead of newline in input and output files
")
COMMON_PARSER.add_argument(
diff -Naur src/rdiffbackup/run.py src/rdiffbackup/run.py
--- src/rdiffbackup/run.py 2023-02-27 07:45:09.000000000 +0100
+++ src/rdiffbackup/run.py 2023-05-11 16:29:37.489784756 +0200
@@ -158,6 +158,8 @@
+++ src/rdiffbackup/run.py 2023-06-07 16:39:27.826150443 +0200
@@ -156,6 +156,8 @@
Globals.set("allow_duplicate_timestamps",
arglist.allow_duplicate_timestamps)
Globals.set("null_separator", arglist.null_separator)
+ if arglist.change_ownership is not None:
+ Globals.set("change_ownership", arglist.change_ownership)
Globals.set("use_compatible_timestamps", arglist.use_compatible_timestamps)
Globals.set("do_fsync", arglist.fsync)
+ if arglist.ignore_numerical_ids is not None:
+ Globals.set_integer('ignore_numerical_ids', 1)
if arglist.current_time is not None:
Globals.set_integer('current_time', arglist.current_time)
if arglist.chars_to_quote is not None:
\ No newline at end of file
Write
Preview
Markdown
is supported
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