From a5664da3fe97158282f6147513835ef08669cce9 Mon Sep 17 00:00:00 2001 From: Brandon Low Date: Mon, 7 Mar 2011 11:17:40 -0800 Subject: [PATCH] Save was using a quoted instead of octal gitmode. This bugged in an assert on python 2.7 for me, and I believe was incorrect but functional behavior. Signed-off-by: Brandon Low Signed-off-by: Avery Pennarun --- cmd/save-cmd.py | 4 ++-- lib/bup/hashsplit.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/save-cmd.py b/cmd/save-cmd.py index 24376af..a340dfb 100755 --- a/cmd/save-cmd.py +++ b/cmd/save-cmd.py @@ -2,7 +2,7 @@ import sys, stat, time, math from bup import hashsplit, git, options, index, client from bup.helpers import * -from bup.hashsplit import GIT_MODE_TREE, GIT_MODE_FILE +from bup.hashsplit import GIT_MODE_TREE, GIT_MODE_FILE, GIT_MODE_SYMLINK optspec = """ @@ -283,7 +283,7 @@ for (transname,ent) in r.filter(extra, wantrecurse=wantrecurse_during): add_error(e) lastskip_name = ent.name else: - (mode, id) = ('120000', w.new_blob(rl)) + (mode, id) = (GIT_MODE_SYMLINK, w.new_blob(rl)) else: add_error(Exception('skipping special file "%s"' % ent.name)) lastskip_name = ent.name diff --git a/lib/bup/hashsplit.py b/lib/bup/hashsplit.py index 914c2bb..2c4ec3a 100644 --- a/lib/bup/hashsplit.py +++ b/lib/bup/hashsplit.py @@ -10,6 +10,7 @@ fanout = 16 GIT_MODE_FILE = 0100644 GIT_MODE_TREE = 040000 +GIT_MODE_SYMLINK = 0120000 assert(GIT_MODE_TREE != 40000) # 0xxx should be treated as octal # The purpose of this type of buffer is to avoid copying on peek(), get(), -- 2.39.2