OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 09-Sep-2002 19:53:19
Branch: HEAD Handle: 2002090918531800
Modified files:
openpkg-src/openpkg openpkg.spec rc
openpkg-web news.txt
Log:
Fixed a subtle login name bug by rearranging user name assignment in rc.
Summary:
Revision Changes Path
1.96 +2 -2 openpkg-src/openpkg/openpkg.spec
1.15 +8 -4 openpkg-src/openpkg/rc
1.1513 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-src/openpkg/openpkg.spec
============================================================
$ cvs diff -u -r1.95 -r1.96 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 4 Sep 2002 15:02:02 -0000 1.95
+++ openpkg-src/openpkg/openpkg.spec 9 Sep 2002 17:53:18 -0000 1.96
@@ -39,8 +39,8 @@
# o any cc(1)
# the package version and release
-%define V_openpkg 20020904
-%define R_openpkg 20020904
+%define V_openpkg 20020909
+%define R_openpkg 20020909
# the used software versions
%define V_rpm 4.0.2
Index: openpkg-src/openpkg/rc
============================================================
$ cvs diff -u -r1.14 -r1.15 rc
--- openpkg-src/openpkg/rc 2 Apr 2002 12:04:46 -0000 1.14
+++ openpkg-src/openpkg/rc 9 Sep 2002 17:53:18 -0000 1.15
@@ -181,18 +181,22 @@
fi
# determine current run-time user
-user="$LOGNAME"
+user="`(whoami) 2>/dev/null | awk '{ printf("%s", $1); }'`"
if [ ".$user" = . ]; then
- user="$USER"
+ user="`(who am i) 2>/dev/null | awk '{ printf("%s", $1); }'`"
if [ ".$user" = . ]; then
- user="`(whoami) 2>/dev/null | awk '{ printf("%s", $1); }'`"
+ user="$LOGNAME"
+ fi
+ if [ ".$user" = . ]; then
+ echo "$0:ERROR: unable to determine current username" 1>&2
if [ ".$user" = . ]; then
- user="`(who am i) 2>/dev/null | awk '{ printf("%s", $1); }'`"
+ user="$USER"
if [ ".$user" = . ]; then
echo "$0:ERROR: unable to determine current username" 1>&2
exit 1
fi
fi
+ exit 1
fi
fi
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.1512 -r1.1513 news.txt
--- openpkg-web/news.txt 9 Sep 2002 16:19:02 -0000 1.1512
+++ openpkg-web/news.txt 9 Sep 2002 17:53:18 -0000 1.1513
@@ -1,3 +1,4 @@
+09-Sep-2002: Upgraded package: P<openpkg-20020909-20020909>
09-Sep-2002: Upgraded package: P<smtpfeed-1.18-20020909>
09-Sep-2002: Upgraded package: P<integrit-3.02.00-20020909>
09-Sep-2002: Upgraded package: P<openldap-2.1.4-20020909>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
