poldek: poldek/cli/desc.c - display package color, if any

[mis]

Author: mis                          Date: Sat Jun 16 14:43:17 2007 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- display package color, if any

---- Files affected:
poldek/poldek/cli:
   desc.c (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: poldek/poldek/cli/desc.c
diff -u poldek/poldek/cli/desc.c:1.27 poldek/poldek/cli/desc.c:1.28
--- poldek/poldek/cli/desc.c:1.27	Sun Aug 20 18:20:16 2006
+++ poldek/poldek/cli/desc.c	Sat Jun 16 16:43:12 2007
@@ -793,16 +793,27 @@
     }
 
     if (pkg->_arch) {
-        char *p = "Arch:";
+        char label[256];
+        int n;
         
-        if (pkg->_os) 
-            p = "Arch/OS:";
-        
-        cmdctx_printf_c(cmdctx, PRCOLOR_CYAN, "%-16s", p);
+        n = n_snprintf(label, sizeof(label), "Arch");
+            
+        if (pkg->_os)
+            n += n_snprintf(&label[n], sizeof(label) - n, "/OS");
+                
+        if (pkg->color)
+            n += n_snprintf(&label[n], sizeof(label) - n, "/Color");
+
+        n += n_snprintf(&label[n], sizeof(label) - n, ":");
+
+        cmdctx_printf_c(cmdctx, PRCOLOR_CYAN, "%-16s", label);
         cmdctx_printf(cmdctx, "%s", pkg_arch(pkg));
             
         if (pkg->_os) 
             cmdctx_printf(cmdctx, "/%s", pkg_os(pkg));
+
+        if (pkg->color)
+            cmdctx_printf(cmdctx, "/%d", pkg->color);
         cmdctx_printf(cmdctx, "\n");
     }
         
@@ -907,7 +918,7 @@
 
         cmdctx_printf(cmdctx, "\n");
         cmdctx_printf_c(cmdctx, PRCOLOR_YELLOW, "%-16s", "Package:");
-        cmdctx_printf(cmdctx, "%s\n", pkg_evr_snprintf_s(pkg));
+        cmdctx_printf(cmdctx, "%s\n", pkg_id(pkg));
         
         if (cmdctx->_flags & OPT_DESC_DESCR) 
             show_description(cmdctx, pkg, cmdctx->_flags);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/poldek/poldek/cli/desc.c?r1=1.27&r2=1.28&f=u