From: Chris Gianelloni Date: Thu, 8 Mar 2007 20:41:09 +0000 (+0000) Subject: Fixing a couple places where I was a bit overzealous in my changes. Thanks to Marcus... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8bd9997e6d8028b76db17bcf2a617bfbbe2be29d;p=gentoo.git Fixing a couple places where I was a bit overzealous in my changes. Thanks to Marcus D. Hanwell for pointing it out. Package-Manager: portage-2.1.2.1 --- diff --git a/app-admin/superadduser/ChangeLog b/app-admin/superadduser/ChangeLog index a7eda505afd6..e946de740a7a 100644 --- a/app-admin/superadduser/ChangeLog +++ b/app-admin/superadduser/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-admin/superadduser # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/superadduser/ChangeLog,v 1.38 2007/03/07 21:32:37 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/superadduser/ChangeLog,v 1.39 2007/03/08 20:41:09 wolf31o2 Exp $ + + 08 Mar 2007; Chris Gianelloni + files/1.0.9/superadduser: + Fixing a couple places where I was a bit overzealous in my changes. Thanks + to Marcus D. Hanwell for pointing it out. 07 Mar 2007; Chris Gianelloni files/1.0.9/superadduser: diff --git a/app-admin/superadduser/Manifest b/app-admin/superadduser/Manifest index ab650cb3de68..62c4dd086336 100644 --- a/app-admin/superadduser/Manifest +++ b/app-admin/superadduser/Manifest @@ -1,10 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX 1.0.9/superadduser 13977 RMD160 5367014769768328146a5a7737dc49293f8fa2e9 SHA1 e7cf5043442499df9cf13cd6e1bd1a47dc69cff6 SHA256 ff4e6714c84a59b83d2d2c950bf76ffcd0636fbe4c3c2fe5b94ca5552bbb4211 -MD5 c722bb24cf5b67a576035675800336f3 files/1.0.9/superadduser 13977 -RMD160 5367014769768328146a5a7737dc49293f8fa2e9 files/1.0.9/superadduser 13977 -SHA256 ff4e6714c84a59b83d2d2c950bf76ffcd0636fbe4c3c2fe5b94ca5552bbb4211 files/1.0.9/superadduser 13977 +AUX 1.0.9/superadduser 13973 RMD160 3182fa68984fb1b384eda2eb06397217af89d94a SHA1 32627246ffc052e18a452fe57e96d11a37d1c585 SHA256 0ae832ca94b2b648dc0be30e71fda02b6dc7b8259fb3bf445d0833b37b4222bf +MD5 417260c5ace8ed80631039e103b144ef files/1.0.9/superadduser 13973 +RMD160 3182fa68984fb1b384eda2eb06397217af89d94a files/1.0.9/superadduser 13973 +SHA256 0ae832ca94b2b648dc0be30e71fda02b6dc7b8259fb3bf445d0833b37b4222bf files/1.0.9/superadduser 13973 AUX superadduser.8 517 RMD160 dc3991d1aa4a62350a1c0d93860db86b90e0c2b5 SHA1 1a0609b5e7b7d7ec473a66dcb9c2509833ac991e SHA256 87c423e40c11b3608c235d2fb2b6ad2505a909c83ff9b285ab59888967b9475d MD5 0d5686d1a7f9fd1035ca0cb455864559 files/superadduser.8 517 RMD160 dc3991d1aa4a62350a1c0d93860db86b90e0c2b5 files/superadduser.8 517 @@ -13,10 +13,10 @@ EBUILD superadduser-1.0.9.ebuild 587 RMD160 5163c09a94090abaec86cf3c0f667f9a1010 MD5 a6d311464bc217bee7fe9e00ce029896 superadduser-1.0.9.ebuild 587 RMD160 5163c09a94090abaec86cf3c0f667f9a101075e8 superadduser-1.0.9.ebuild 587 SHA256 96bc21a2d304b30b6a7bb4728e8b2f274fa7bbec62ddddba64a1c576513723fd superadduser-1.0.9.ebuild 587 -MISC ChangeLog 5361 RMD160 ddcc156dfbb69f291d76daffde4079c5ad317384 SHA1 f31b03952235d30b5038aacc818e748aabe5e472 SHA256 ce5f1b240f00a516204dfa75c407d8dd3e66ca3a764c4b9be9ed248879db2b60 -MD5 2d5dbce1677be31f81b67cd9a5688350 ChangeLog 5361 -RMD160 ddcc156dfbb69f291d76daffde4079c5ad317384 ChangeLog 5361 -SHA256 ce5f1b240f00a516204dfa75c407d8dd3e66ca3a764c4b9be9ed248879db2b60 ChangeLog 5361 +MISC ChangeLog 5584 RMD160 e702d196d1e765a24ad126c9ef3172a7710ebac7 SHA1 3e8d16965d8f6fd11f9ca14a63c4d1d1759094fa SHA256 db56ad977c22e76325ac34bcd338f5d8ca882b3e3714eefa48f7522898528e68 +MD5 d45487175d898cc818ab4651c71aa848 ChangeLog 5584 +RMD160 e702d196d1e765a24ad126c9ef3172a7710ebac7 ChangeLog 5584 +SHA256 db56ad977c22e76325ac34bcd338f5d8ca882b3e3714eefa48f7522898528e68 ChangeLog 5584 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -27,7 +27,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFF7y96kT4lNIS36YERAlg5AJ95RweaWUKpymaFS/AnGE1meB/4GgCgu3ZI -Cd27vEIqTCDC6Z8YiLg6mO0= -=ZBaQ +iD8DBQFF8HTqkT4lNIS36YERAprkAKCJnz7p79pT67InUFxX7nIhAvpaBwCgvPaX +AjSMzRyVrvR1Ue1B8Ylal/I= +=pa+L -----END PGP SIGNATURE----- diff --git a/app-admin/superadduser/files/1.0.9/superadduser b/app-admin/superadduser/files/1.0.9/superadduser index d722d0948fc1..dd5e3158ddad 100644 --- a/app-admin/superadduser/files/1.0.9/superadduser +++ b/app-admin/superadduser/files/1.0.9/superadduser @@ -132,7 +132,7 @@ function display () { goose="$(echo $2 | cut -d ' ' -f 2-)" # lop off the prefixed argument useradd needs echo -n "$1 " # If it's null then display the 'other' information - if [[ -z "$goose" -a ! -z "$3" ]]; then + if [ -z "$goose" -a ! -z "$3" ]; then echo "$3" else echo "$goose" @@ -147,7 +147,7 @@ function check_group () { local uid_not_named="" uid_not_num="" grep -v "$^" $gfile | awk -F: '{print $1}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_named=yes grep -v "$^" $gfile | awk -F: '{print $3}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_num=yes - if [[ ! -z "$uid_not_named" -a ! -z "$uid_not_num" ]]; then + if [ ! -z "$uid_not_named" -a ! -z "$uid_not_num" ]; then echo "- Group '$group' does not exist" got_error=yes fi