[openrtm-commit:02916] r3071 - trunk/OpenRTM-aist/build

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2017-11-09 17:18:34 +0900 (Thu, 09 Nov 2017)
New Revision: 3071

Modified:
   trunk/OpenRTM-aist/build/pkg_install_debian.sh
   trunk/OpenRTM-aist/build/pkg_install_raspbian.sh
   trunk/OpenRTM-aist/build/pkg_install_ubuntu.sh
Log:
[compat, ->RELENG_1_1] fixed bug. refs #4221

Modified: trunk/OpenRTM-aist/build/pkg_install_debian.sh
===================================================================
--- trunk/OpenRTM-aist/build/pkg_install_debian.sh	2017-11-08 04:16:27 UTC (rev 3070)
+++ trunk/OpenRTM-aist/build/pkg_install_debian.sh	2017-11-09 08:18:34 UTC (rev 3071)
@@ -307,10 +307,16 @@
       exit 0
     else
       echo $openrtm_repo >> /etc/apt/sources.list
-　　　# 公開鍵登録
-      apt-key adv --keyserver keys.gnupg.net --recv-keys 4BCE106E087AFAC0
     fi
   fi
+
+  if test "x$FORCE_YES" = "xtrue" ; then
+    apt-get install --assume-yes --allow-unauthenticated dirmngr
+  else
+    apt-get install dirmngr
+  fi
+  # 公開鍵登録
+  apt-key adv --keyserver keys.gnupg.net --recv-keys 4BCE106E087AFAC0
 }
 
 #----------------------------------------

Modified: trunk/OpenRTM-aist/build/pkg_install_raspbian.sh
===================================================================
--- trunk/OpenRTM-aist/build/pkg_install_raspbian.sh	2017-11-08 04:16:27 UTC (rev 3070)
+++ trunk/OpenRTM-aist/build/pkg_install_raspbian.sh	2017-11-09 08:18:34 UTC (rev 3071)
@@ -297,10 +297,16 @@
       exit 0
     else
       echo $openrtm_repo >> /etc/apt/sources.list
-　　　# 公開鍵登録
-      apt-key adv --keyserver keys.gnupg.net --recv-keys 4BCE106E087AFAC0
     fi
   fi
+
+  if test "x$FORCE_YES" = "xtrue" ; then
+    apt-get install --assume-yes --allow-unauthenticated dirmngr
+  else
+    apt-get install dirmngr
+  fi
+　# 公開鍵登録
+  apt-key adv --keyserver keys.gnupg.net --recv-keys 4BCE106E087AFAC0
 }
 
 #----------------------------------------

Modified: trunk/OpenRTM-aist/build/pkg_install_ubuntu.sh
===================================================================
--- trunk/OpenRTM-aist/build/pkg_install_ubuntu.sh	2017-11-08 04:16:27 UTC (rev 3070)
+++ trunk/OpenRTM-aist/build/pkg_install_ubuntu.sh	2017-11-09 08:18:34 UTC (rev 3071)
@@ -303,10 +303,10 @@
       exit 0
     else
       echo $openrtm_repo >> /etc/apt/sources.list
-　　　# 公開鍵登録
-      apt-key adv --keyserver keys.gnupg.net --recv-keys 4BCE106E087AFAC0
     fi
   fi
+  # 公開鍵登録
+  apt-key adv --keyserver keys.gnupg.net --recv-keys 4BCE106E087AFAC0
 }
 
 #----------------------------------------