fsck: Refuse to do anything if more than one of --incremental, --more, and --incremental-schedule are given, since it's not clear which option should win.
This commit is contained in:
parent
7d288d83c9
commit
9edc3a735d
2 changed files with 8 additions and 3 deletions
|
@ -67,6 +67,7 @@ seek :: CommandSeek
|
|||
seek ps = do
|
||||
from <- getOptionField fsckFromOption Remote.byNameWithUUID
|
||||
i <- getIncremental
|
||||
liftIO $ print i
|
||||
withKeyOptions
|
||||
(\k -> startKey i k =<< getNumCopies)
|
||||
(withFilesInGit $ whenAnnexed $ start from i)
|
||||
|
@ -80,11 +81,12 @@ getIncremental = do
|
|||
morei <- Annex.getFlag (optionName moreIncrementalOption)
|
||||
case (i, starti, morei) of
|
||||
(False, False, False) -> return NonIncremental
|
||||
(False, True, _) -> startIncremental
|
||||
(False, True, False) -> startIncremental
|
||||
(False ,False, True) -> ContIncremental <$> getStartTime
|
||||
(True, _, _) ->
|
||||
(True, False, False) ->
|
||||
maybe startIncremental (return . ContIncremental . Just)
|
||||
=<< getStartTime
|
||||
_ -> error "Specify only one of --incremental, --more, or --incremental-schedule"
|
||||
where
|
||||
startIncremental = do
|
||||
recordStartTime
|
||||
|
@ -408,7 +410,7 @@ badContentRemote remote key = do
|
|||
++ Remote.name remote
|
||||
|
||||
data Incremental = StartIncremental | ContIncremental (Maybe EpochTime) | NonIncremental
|
||||
deriving (Eq)
|
||||
deriving (Eq, Show)
|
||||
|
||||
runFsck :: Incremental -> FilePath -> Key -> Annex Bool -> CommandStart
|
||||
runFsck inc file key a = ifM (needFsck inc key)
|
||||
|
|
3
debian/changelog
vendored
3
debian/changelog
vendored
|
@ -20,6 +20,9 @@ git-annex (5.20140211) UNRELEASED; urgency=medium
|
|||
overridden in .git/config.
|
||||
* glacier: Do not try to run glacier value create when an existing glacier
|
||||
remote is enabled.
|
||||
* fsck: Refuse to do anything if more than one of --incremental, --more,
|
||||
and --incremental-schedule are given, since it's not clear which option
|
||||
should win.
|
||||
* Windows webapp: Can set up box.com, Amazon S3, and rsync.net remotes
|
||||
* Windows webapp: Can create repos on removable drives.
|
||||
* Windows: Ensure HOME is set, as needed by bundled cygwin utilities.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue