Changeset 1605

Timestamp:

05/27/12 13:43:44 (13 months ago)

Author:

bruno

Message:

• Change urpmi.update call from /usr/bin (consolehelper) to /usr/sbin (urpmi) as that's what we have in VE.

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (2 diffs)
• pb/bin/pb (modified) (1 diff)
• pb/t/pbtest (modified) (1 diff)

devel/pb-modules/etc/pb.conf

@@ -229 +229 @@
 osupd gen = sudo /usr/bin/emerge --update --deep world; sudo /usr/bin/revdep-rebuild
 osupd rpm = sudo /usr/bin/yum clean all; sudo /usr/bin/yum -y update
-osupd md = sudo /usr/bin/urpmi.update -a ; sudo /usr/sbin/urpmi --auto --auto-select --no-suggests
+osupd md = sudo /usr/sbin/urpmi.update -a ; sudo /usr/sbin/urpmi --auto --auto-select --no-suggests
 osupd opensuse-11.1 = sudo /usr/bin/zypper -n update
 osupd opensuse = sudo /usr/bin/zypper --gpg-auto-import-keys -n update
@@ -243 +243 @@
 osins rhel-3 = sudo /usr/sbin/up2date -y 
 osins rhel-4 = sudo /usr/sbin/up2date -y 
-osins md = sudo /usr/bin/urpmi.update -a ; sudo /usr/sbin/urpmi --auto --no-suggests
+osins md = sudo /usr/sbin/urpmi.update -a ; sudo /usr/sbin/urpmi --auto --no-suggests
 osins novell = export TERM=linux ; export PATH=\$PATH:/sbin:/usr/sbin ; sudo /sbin/yast2 -i 
 osins opensuse-10.2 = yes | sudo /usr/bin/zypper install

devel/pb/bin/pb

@@ -2075 +2075 @@
 # Link to the key
 if [ -s $ENV{'PBPROJ'}.pubkey ]; then
+    # Avoiding creating empty repomd.xml.key; fails on opensuse 12.1
     (cd repodata ; ln -sf ../$ENV{'PBPROJ'}.pubkey repomd.xml.key)
-else
-    echo "Avoiding creating empty repomd.xml.key; fails on opensuse 12.1"
 fi
 # sign the repomd (at least useful for SLES - which requires a local key)

devel/pb/t/pbtest

@@ -363 +363 @@
 sudopbtest "pb clean"
 sudopbtest "killall svnserve" 1
-
+exit