Attachment 161952 Details for Bug 244531 – Show product architecture

[patch] Show product architecture

archinfo.patch (text/plain), 4.36 KB, created by Martin Sivák on 2007-08-21 08:15:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Sivák

Created: 2007-08-21 08:15:14 UTC

Size: 4.36 KB

patch

obsolete

>--- ./loader2/loader.h.orig	2007-05-24 23:18:10.000000000 +0200
>+++ ./loader2/loader.h	2007-08-17 14:31:10.000000000 +0200
>@@ -84,6 +84,7 @@ void startNewt(void);
> void stopNewt(void);
> char * getProductName(void);
> char * getProductPath(void);
>+char * getProductArch(void);
> 
> #include "modules.h"
> #include "moduledeps.h"
>--- ./loader2/loader.c.orig	2007-05-24 23:18:10.000000000 +0200
>+++ ./loader2/loader.c	2007-08-21 10:10:35.000000000 +0200
>@@ -152,7 +152,10 @@ void doShell(void) {
> 
> void startNewt(void) {
>     if (!newtRunning) {
>-        char *buf = sdupprintf(_("Welcome to %s"), getProductName());
>+        char *buf;
>+	if(getProductArch()) buf = sdupprintf(_("Welcome to %s for %s"), getProductName(), getProductArch());
>+	else buf = sdupprintf(_("Welcome to %s"), getProductName());
>+
>         newtInit();
>         newtCls();
>         newtDrawRootText(0, 0, buf);
>@@ -175,6 +178,8 @@ void stopNewt(void) {
> 
> static char * productName = NULL;
> static char * productPath = NULL;
>+static char * productArch = NULL;
>+static char * productStamp = NULL;
> 
> static void initProductInfo(void) {
>     FILE *f;
>@@ -185,9 +190,13 @@ static void initProductInfo(void) {
>         productName = strdup("anaconda");
>         productPath = strdup("anaconda");
>     } else {
>+			  productStamp = malloc(256);
>         productName = malloc(256);
>         productPath = malloc(256);
>-        productName = fgets(productName, 256, f); /* stamp time */
>+        productStamp = fgets(productStamp, 256, f); /* stamp time and architecture */
>+				productArch = strstr(productStamp, "."); /* architecture is separated by dot */
>+				if(productArch) productArch++;
>+
>         productName = fgets(productName, 256, f); /* product name */
>         productPath = fgets(productPath, 256, f); /* product version */
>         productPath = fgets(productPath, 256, f); /* product path */
>@@ -203,6 +212,8 @@ static void initProductInfo(void) {
>             i--;
>         }
>     }
>+
>+    if(!productArch) productArch = strdup("unknown architecture");
> }
> 
> char * getProductName(void) {
>@@ -212,6 +223,13 @@ char * getProductName(void) {
>     return productName;
> }
> 
>+char * getProductArch(void) {
>+    if (!productArch) {
>+       initProductInfo();
>+    }
>+    return productArch;
>+}
>+
> char * getProductPath(void) {
>     if (!productPath) {
>        initProductInfo();
>--- ./constants.py.orig	2007-08-15 11:00:57.000000000 +0200
>+++ ./constants.py	2007-08-15 11:00:34.000000000 +0200
>@@ -59,6 +59,7 @@ NUMBER_OF_CDS = 5
> import product
> productName = product.productName
> productVersion = product.productVersion
>+productArch = product.productArch
> productPath = product.productPath
> bugzillaUrl = product.bugUrl
> 
>--- ./product.py.orig	2007-08-15 11:01:10.000000000 +0200
>+++ ./product.py	2007-08-15 10:59:03.000000000 +0200
>@@ -26,6 +26,7 @@ productStamp = ""
> productName = "anaconda"
> productVersion = "bluesky"
> productPath = "anaconda"
>+productArch = None
> bugUrl = "your distribution provided bug reporting tool."
> 
> if path is not None:
>@@ -33,6 +34,7 @@ if path is not None:
>     lines = f.readlines()
>     if len(lines) >= 3:
>         productStamp = lines[0][:-1]
>+        productArch = productStamp[productStamp.index(".")+1:]
>         productName = lines[1][:-1]
>         productVersion = lines[2][:-1]
>     if len(lines) >= 4:
>@@ -46,5 +48,7 @@ if os.environ.has_key("ANACONDA_PRODUCTV
>     productVersion = os.environ["ANACONDA_PRODUCTVERSION"]
> if os.environ.has_key("ANACONDA_PRODUCTPATH"):
>     productPath = os.environ["ANACONDA_PRODUCTPATH"]
>+if os.environ.has_key("ANACONDA_PRODUCTARCH"):
>+    productArch = os.environ["ANACONDA_PRODUCTARCH"]
> if os.environ.has_key("ANACONDA_BUGURL"):
>     bugUrl = os.environ["ANACONDA_BUGURL"]
>--- ./text.py.orig	2007-08-15 11:01:19.000000000 +0200
>+++ ./text.py	2007-08-15 11:39:22.000000000 +0200
>@@ -466,7 +466,10 @@ class InstallInterface:
> 
>     def drawFrame(self):
>         self.screen.drawRootText (0, 0, self.screen.width * " ")
>-        self.screen.drawRootText (0, 0, _("Welcome to %s") % productName)
>+        if productArch:
>+          self.screen.drawRootText (0, 0, _("Welcome to %s for %s") % (productName, productArch,))
>+        else:
>+          self.screen.drawRootText (0, 0, _("Welcome to %s") % productName)
> 
> 	if (os.access("/usr/share/anaconda/help/C/s1-help-screens-lang.txt", os.R_OK)):
> 	    self.screen.pushHelpLine(_(" <F1> for help | <Tab> between elements | <Space> selects | <F12> next screen"))

Actions: View | Diff

Attachments on bug 244531: 161952