[Commits] idmgr branch master updated.
Martin Langhoff
martin at laptop.org
Wed Apr 21 17:06:12 EDT 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "/home/olpc-code/git/projects/idmgr".
The branch, master has been updated
via acb83aa413bf68fd504d8920ea26c9494f0c9ea8 (commit)
via bc52a5a25df28ef8eb034a2ab766daa72af2e889 (commit)
via 3c8f894d69ba1e4be4747b763c4674b39955bf25 (commit)
from a5453fcd0dfdcf8ca02673529c0ebe7655668195 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
scripts/remove_user | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
- Log -----------------------------------------------------------------
commit acb83aa413bf68fd504d8920ea26c9494f0c9ea8
Merge: a5453fc... bc52a5a...
Author: Martin Langhoff <martin at laptop.org>
Date: Wed Apr 21 23:05:59 2010 +0200
Merge branch 'xs-0.6'
commit bc52a5a25df28ef8eb034a2ab766daa72af2e889
Merge: 3c8f894... 8113468...
Author: Martin Langhoff <martin at laptop.org>
Date: Wed Apr 21 23:04:52 2010 +0200
Merge branch 'origin/master' (early part)
commit 3c8f894d69ba1e4be4747b763c4674b39955bf25
Author: Martin Langhoff <martin at laptop.org>
Date: Wed Apr 21 23:03:03 2010 +0200
remove_user: fix path to userdel
/usr/sbin is not in the PATH in some cases. Pointed out
by the La Rioja team.
diff --git a/README b/README
index 1122ce8..1ec6c2c 100644
--- a/README
+++ b/README
@@ -37,3 +37,4 @@ database = idmanager.Database(config.SQLITE3_FILE)
for serial in database.get_serials():
print database.get_laptop(serial)
+foo
diff --git a/scripts/remove_user b/scripts/remove_user
index 47926ae..e9d4986 100755
--- a/scripts/remove_user
+++ b/scripts/remove_user
@@ -3,5 +3,5 @@
for serial; do
echo "$serial" | grep -s -E '^[A-Z]{3}[A-F0-9]{8}$' || exit 1
sqlite3 /home/idmgr/identity.db "DELETE FROM laptops WHERE serial = '$serial'" || exit 1
- userdel $serial
-done
\ No newline at end of file
+ /usr/sbin/userdel $serial
+done
-----------------------------------------------------------------------
--
/home/olpc-code/git/projects/idmgr
More information about the Commits
mailing list