[interchange-cvs] interchange - jon modified 3 files

[interchange-core@interchange.redhat.com]

User:      jon
Date:      2002-01-11 09:45:12 GMT
Modified:  lib/Vend MakeCat.pm
Modified:  scripts  makecat.PL newcat.PL
Log:
Switch to &Sys::Hostname::hostname instead of `hostname`.

Revision  Changes    Path
2.8       +4 -3      interchange/lib/Vend/MakeCat.pm


rev 2.8, prev_rev 2.7
Index: MakeCat.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/MakeCat.pm,v
retrieving revision 2.7
retrieving revision 2.8
diff -u -u -r2.7 -r2.8
--- MakeCat.pm	2001/09/04 20:15:53	2.7
+++ MakeCat.pm	2002/01/11 09:45:12	2.8
@@ -1,6 +1,6 @@
 # Vend::MakeCat - Routines for Interchange catalog configurator
 #
-# $Id: MakeCat.pm,v 2.7 2001/09/04 20:15:53 jon Exp $
+# $Id: MakeCat.pm,v 2.8 2002/01/11 09:45:12 jon Exp $
 #
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -28,6 +28,7 @@
 use File::Find;
 use File::Copy;
 use File::Basename;
+use Sys::Hostname;
 use Vend::Util;
 require Safe;
 $Safe = new Safe;
@@ -109,7 +110,7 @@
 	%Window
 /;
 
-$VERSION = substr(q$Revision: 2.7 $, 10);
+$VERSION = substr(q$Revision: 2.8 $, 10);
 
 $Force = 0;
 $History = 0;
@@ -2142,7 +2143,7 @@
 		}
 		
 		if($handle eq ' ') {
-			$servname = `hostname` unless $servname;
+			$servname = Sys::Hostname::hostname() unless $servname;
 			$servname =~ s/\s+$//;
 			$main = $servname;
 			$servers->{$servname} = {} if ! $servers->{$servname};



2.11      +4 -5      interchange/scripts/makecat.PL


rev 2.11, prev_rev 2.10
Index: makecat.PL
===================================================================
RCS file: /var/cvs/interchange/scripts/makecat.PL,v
retrieving revision 2.10
retrieving revision 2.11
diff -u -u -r2.10 -r2.11
--- makecat.PL	2001/10/04 20:48:23	2.10
+++ makecat.PL	2002/01/11 09:45:12	2.11
@@ -50,7 +50,7 @@
 #
 # Interchange catalog configurator
 #
-# $Id: makecat.PL,v 2.10 2001/10/04 20:48:23 jon Exp $
+# $Id: makecat.PL,v 2.11 2002/01/11 09:45:12 jon Exp $
 #
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -79,6 +79,7 @@
 use File::Find;
 use File::Copy;
 use File::Path;
+use Sys::Hostname;
 use Vend::MakeCat;
 use Vend::Util;
 use Getopt::Long;
@@ -476,9 +477,7 @@
 							get_id(); },
 	interchangegroup=>  '',
     servername => sub {
-						my $host = `hostname`;
-						chomp $host;
-						return $host || $Config{myhostname};
+						return Sys::Hostname::hostname() || $Config{myhostname};
 					},
     linkmode     =>  'UNIX',
     documentroot =>  $ENV{MVC_DOCUMENTROOT} || $DocrootDefault,
@@ -2279,7 +2278,7 @@
 
 =head1 VERSION
 
-# $Id: makecat.PL,v 2.10 2001/10/04 20:48:23 jon Exp $
+# $Id: makecat.PL,v 2.11 2002/01/11 09:45:12 jon Exp $
 
 =head1 INTRODUCTION
 



2.3       +3 -4      interchange/scripts/newcat.PL


rev 2.3, prev_rev 2.2
Index: newcat.PL
===================================================================
RCS file: /var/cvs/interchange/scripts/newcat.PL,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -u -r2.2 -r2.3
--- newcat.PL	2001/09/01 14:26:50	2.2
+++ newcat.PL	2002/01/11 09:45:12	2.3
@@ -52,7 +52,7 @@
 #
 # Interchange catalog configurator with curses
 #
-# $Id: newcat.PL,v 2.2 2001/09/01 14:26:50 mheins Exp $
+# $Id: newcat.PL,v 2.3 2002/01/11 09:45:12 jon Exp $
 #
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -80,6 +80,7 @@
 use File::Find;
 use File::Copy;
 use File::Path;
+use Sys::Hostname;
 use Vend::MakeCat;
 use Vend::Util;
 use Vend::Config;
@@ -575,9 +576,7 @@
 									if $Servers->{$_}{Master}
 							}
 						}
-						my $host = `hostname`;
-						chomp $host;
-						return $host || $Config{myhostname};
+						return Sys::Hostname::hostname() || $Config{myhostname};
 					},
 	samplehtml   =>  sub {
 						return $ENV{MVC_SAMPLEHTML} if $ENV{MVC_SAMPLEHTML};