* lisp/pkgusr.el (pkgusr-cmd-pkg): Use the new #'user-group-name
from latest SXEmacs. This fixes the issue of a pkgusr sub-group
being displayed as "nil".
(pkgusr-file-pkg): Ditto.
* usr/lib/pkgusr/update-pkg-project: Always exit zero.
Signed-off-by: Steve Youngs <steve@steveyoungs.com>
;; Author: Steve Youngs <steve@sxemacs.org>
;; Maintainer: Steve Youngs <steve@sxemacs.org>
;; Created: <2007-07-13>
;; Author: Steve Youngs <steve@sxemacs.org>
;; Maintainer: Steve Youngs <steve@sxemacs.org>
;; Created: <2007-07-13>
-;; Time-stamp: <Sunday Mar 16, 2014 01:10:12 steve>
+;; Time-stamp: <Monday Mar 17, 2014 22:33:38 steve>
;; Homepage: N/A
;; Keywords: utils package-management
;; Homepage: N/A
;; Keywords: utils package-management
(narrow-to-region start end)
(goto-char (point-min))))
(narrow-to-region start end)
(goto-char (point-min))))
-;;; FIXME: doesn't work for sub-groups.
(defun pkgusr-cmd-pkg (cmd)
"Display the package name \(user:group\) which contains CMD.
(defun pkgusr-cmd-pkg (cmd)
"Display the package name \(user:group\) which contains CMD.
(error 'pkgusr-unknown-cmd cmd)))
(user (user-login-name
(nth 2 (file-attributes cmd))))
(error 'pkgusr-unknown-cmd cmd)))
(user (user-login-name
(nth 2 (file-attributes cmd))))
- (group (user-login-name
- (nth 3 (file-attributes cmd)))))
+ (group (or (declare-fboundp (user-group-name
+ (nth 3 (file-attributes cmd))))
+ (user-login-name
+ (nth 3 (file-attributes cmd))))))
(unless (or (member user pkgusr-all-pkgs)
(member group pkgusr-all-pkgs))
(error 'pkgusr-unknown-pkg user))
(unless (or (member user pkgusr-all-pkgs)
(member group pkgusr-all-pkgs))
(error 'pkgusr-unknown-pkg user))
(interactive "fFile: ")
(let ((user (user-login-name
(nth 2 (file-attributes file))))
(interactive "fFile: ")
(let ((user (user-login-name
(nth 2 (file-attributes file))))
- (group (user-login-name
- (nth 3 (file-attributes file)))))
+ (group (or (declare-fboundp (user-group-name
+ (nth 3 (file-attributes file))))
+ (user-login-name
+ (nth 3 (file-attributes file))))))
(unless (or (member user pkgusr-all-pkgs)
(member group pkgusr-all-pkgs))
(error 'pkgusr-unknown-pkg user))
(unless (or (member user pkgusr-all-pkgs)
(member group pkgusr-all-pkgs))
(error 'pkgusr-unknown-pkg user))
# If we're root, chown the .project file
[[ $(id -u) -eq 0 ]] && chown -v ${pkg}:${pkg} ${pkgdir}/.project
# If we're root, chown the .project file
[[ $(id -u) -eq 0 ]] && chown -v ${pkg}:${pkg} ${pkgdir}/.project