Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1:/tmp/cvs-serv22168
Modified Files:
Tag: uidgid
User.pm
Log Message:
Seems it was the user perlmodule that was broke, this seems to do the trick, now just
need to add the dpkg levels and it should be done
Index: User.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Attic/User.pm,v
retrieving revision 1.1.2.25
retrieving revision 1.1.2.26
diff -u -d -r1.1.2.25 -r1.1.2.26
--- User.pm 13 Aug 2003 02:09:30 -0000 1.1.2.25
+++ User.pm 13 Aug 2003 04:53:58 -0000 1.1.2.26
@@ -24,8 +24,6 @@
use Fink::Config qw($config $basepath $debarch);
use Fink::Services qw(&execute &print_breaking &prompt &prompt_boolean);
-use User::grent;
-use User::pwent;
use File::Find;
use Fcntl ':mode'; # for search_comparedb
@@ -78,6 +76,8 @@
find({ wanted => $wanted, follow => 1, no_chdir => 1 }, $rootdir);
foreach $file (@filelist) {
+ ### reset uid and gid
+ ($gid, $uid) = ("None", "None");
### Don't add DEBIAN dir
next if ($file =~ /DEBIAN/);
### Skip the rootdir
@@ -86,16 +86,19 @@
($dev, $ino, $mode, $nlink, $uid, $gid) = lstat($file);
### Skip anything that doesn't have a user or group;
- # next if (not $uid or not $gid);
+ next if ($uid eq "None" or $gid eq "None");
- $usr = User::pwent::getpwuid($uid);
- $grp = User::grent::getgrgid($gid);
+ $usr = `/usr/bin/nidump passwd . | /usr/bin/grep \"*:$uid:\" |
/usr/bin/cut -d\":\" -f1`;
+ $grp = `/usr/bin/nidump group . | /usr/bin/grep \"*:$gid:\" |
/usr/bin/cut -d\":\" -f1`;
+
+ chomp($usr);
+ chomp($grp);
### Remove $basepath/src/root-...
$file =~ s/^$rootdir//g;
### DEBUG
- print "Processing $file...UID: $uid, GID: $gid\n";
+ print "Processing \%i$file...UID: $uid ($usr), GID: $gid ($grp)\n";
push(@files, $file);
push(@users, $usr);
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
