From a7615e2fe7f9aee6122d23ecdb9a92cfd1baeae1 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <matthias.beyer@atos.net>
Date: Thu, 21 Jan 2021 08:20:58 +0100
Subject: Remove RunnableJob::package_environment()

This functionality is not required anymore, as we put the whole package
definition in the job script interpolation anyways.

Signed-off-by: Matthias Beyer <matthias.beyer@atos.net>
---
 src/endpoint/configured.rs |  5 -----
 src/job/runnable.rs        | 21 ---------------------
 2 files changed, 26 deletions(-)

(limited to 'src')

diff --git a/src/endpoint/configured.rs b/src/endpoint/configured.rs
index b89b0a5..fd419a4 100644
--- a/src/endpoint/configured.rs
+++ b/src/endpoint/configured.rs
@@ -298,11 +298,6 @@ impl<'a> PreparedContainer<'a> {
             .environment()
             .into_iter()
             .map(|(k, v)| format!("{}={}", k.as_ref(), v))
-            .chain({
-                job.package_environment()
-                    .into_iter()
-                    .map(|(k, v)| format!("{}={}", k, v))
-            })
             .collect::<Vec<_>>();
         trace!("Job resources: Environment variables = {:?}", envs);
 
diff --git a/src/job/runnable.rs b/src/job/runnable.rs
index 620df73..a7ddb52 100644
--- a/src/job/runnable.rs
+++ b/src/job/runnable.rs
@@ -138,25 +138,4 @@ impl RunnableJob {
         }
     }
 
-    pub fn package_environment(&self) -> Vec<(String, String)> {
-        vec![
-            (
-                String::from("BUTIDO_PACKAGE_NAME"),
-                self.package().name().clone().to_string(),
-            ),
-            (
-                String::from("BUTIDO_PACKAGE_VERSION"),
-                self.package().version().clone().to_string(),
-            ),
-            (
-                String::from("BUTIDO_PACKAGE_VERSION_IS_SEMVER"),
-                String::from(if *self.package().version_is_semver() {
-                    "true"
-                } else {
-                    "false"
-                }),
-            ),
-        ]
-    }
-
 }
-- 
cgit v1.2.3