* tentative merge of onelab myplc

[myplc.git] / plc.d / packages

diff --git a/plc.d/packages b/plc.d/packages
index 453f9c6..6b02bd5 100755 (executable)
--- a/plc.d/packages
+++ b/plc.d/packages
@@ -7,7 +7,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: packages,v 1.7 2007/02/04 01:05:28 mlhuang Exp $
+# $Id: packages 129 2007-03-20 12:04:03Z thierry $
 #
 
 # Source function library and configuration
@@ -81,16 +81,16 @@ case "$1" in
 
            # Old command is yum-arch
            if [ $yum_arch -eq 1 ] ; then
-               yum-arch $repository
+               yum-arch $repository | tr '\r' '\n' | grep -v '^ *$'
                check
            fi
 
            # New command is createrepo
            if [ $createrepo -eq 1 ] ; then
                if [ -f $repository/yumgroups.xml ] ; then
-                   createrepo -g yumgroups.xml $repository
+                   createrepo -g yumgroups.xml $repository | tr '\r' '\n' | grep -v '^ *$'
                else
-                   createrepo $repository
+                   createrepo $repository | tr '\r' '\n' | grep -v '^ *$'
                fi
                check
            fi