projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
that didn't work either, perhaps this will instead?
[monkeysphere.git]
/
src
/
common
diff --git
a/src/common
b/src/common
index efee9bd69bc1c2389937b1fd66077b887a94a81d..f6000d31d223d9245c967d6bc0324575cc84a1ca 100644
(file)
--- a/
src/common
+++ b/
src/common
@@
-147,7
+147,7
@@
advance_date() {
local shortunits
# try things the GNU way first
local shortunits
# try things the GNU way first
- if date -d "$number $longunits" "$format" >
&/dev/null
; then
+ if date -d "$number $longunits" "$format" >
/dev/null 2>&1
; then
date -d "$number $longunits" "$format"
else
# otherwise, convert to (a limited version of) BSD date syntax:
date -d "$number $longunits" "$format"
else
# otherwise, convert to (a limited version of) BSD date syntax:
@@
-639,7
+639,7
@@
process_user_id() {
;;
'uid') # user ids
if [ "$lastKey" != pub ] ; then
;;
'uid') # user ids
if [ "$lastKey" != pub ] ; then
- log verbose "
-
got a user ID after a sub key?! user IDs should only follow primary keys!"
+ log verbose "
!
got a user ID after a sub key?! user IDs should only follow primary keys!"
continue
fi
# if an acceptable user ID was already found, skip
continue
fi
# if an acceptable user ID was already found, skip
@@
-652,6
+652,8
@@
process_user_id() {
if [ "$validity" = 'u' -o "$validity" = 'f' ] ; then
# mark user ID acceptable
uidOK=true
if [ "$validity" = 'u' -o "$validity" = 'f' ] ; then
# mark user ID acceptable
uidOK=true
+ else
+ log debug " - unacceptable user ID validity ($validity)."
fi
else
continue
fi
else
continue
@@
-693,10
+695,12
@@
process_user_id() {
# if sub key validity is not ok, skip
if [ "$validity" != 'u' -a "$validity" != 'f' ] ; then
# if sub key validity is not ok, skip
if [ "$validity" != 'u' -a "$validity" != 'f' ] ; then
+ log debug " - unacceptable sub key validity ($validity)."
continue
fi
# if sub key capability is not ok, skip
if ! check_capability "$usage" $requiredCapability ; then
continue
fi
# if sub key capability is not ok, skip
if ! check_capability "$usage" $requiredCapability ; then
+ log debug " - unacceptable sub key capability ($usage)."
continue
fi
continue
fi