packages: poldek/poldek-git.patch, poldek/poldek.spec - rel 7; add llu -t f...

[cactus]

Author: cactus                       Date: Tue Mar 27 23:36:40 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 7; add llu -t fix - sort out also installed column

---- Files affected:
packages/poldek:
   poldek-git.patch (1.7 -> 1.8) , poldek.spec (1.443 -> 1.444) 

---- Diffs:

================================================================
Index: packages/poldek/poldek-git.patch
diff -u packages/poldek/poldek-git.patch:1.7 packages/poldek/poldek-git.patch:1.8
--- packages/poldek/poldek-git.patch:1.7	Fri Mar 23 11:44:22 2012
+++ packages/poldek/poldek-git.patch	Wed Mar 28 01:36:35 2012
@@ -117,3 +117,61 @@
              break;
              
          case HTTP_STATUS_FORBIDDEN:
+commit 0fcb9d8a7fe825c1a4c5f3cff2bd30312b615510
+Author: Bartlomiej Zimon <uzi18 at o2.pl>
+Date:   Wed Mar 28 03:25:18 2012 +0200
+
+    - sort also installed evr column on llu -t,
+      just sort before evr array creation
+    
+    Signed-off-by: Bartlomiej Zimon <uzi18 at o2.pl>
+
+diff --git a/cli/ls.c b/cli/ls.c
+index fe25dc3..13f2eaa 100644
+--- a/cli/ls.c
++++ b/cli/ls.c
+@@ -337,7 +337,6 @@ static tn_array *do_upgradeable(struct cmdctx *cmdctx, tn_array *ls_ents,
+     return ls_ents2;
+ }
+ 
+-    
+ 
+ static int ls(struct cmdctx *cmdctx) 
+ {
+@@ -346,6 +345,7 @@ static int ls(struct cmdctx *cmdctx)
+     int                  rc = 1;
+     char                 *path = NULL, pwdpath[PATH_MAX], *pwd;
+     unsigned             ldflags = 0;
++    tn_fn_cmp            cmpf;
+ 
+     if (cmdctx->_flags & OPT_LS_INSTALLED)
+         ldflags = POCLIDEK_LOAD_INSTALLED;
+@@ -364,6 +364,9 @@ static int ls(struct cmdctx *cmdctx)
+         goto l_end;
+     }
+ 
++    if ((cmpf = select_cmpf(cmdctx->_flags)))
++         n_array_sort_ex(ls_ents, cmpf);
++
+     if (cmdctx->_flags & OPT_LS_UPGRADEABLE) {
+         tn_array *tmp;
+ 
+@@ -379,10 +382,6 @@ static int ls(struct cmdctx *cmdctx)
+     }
+     
+     if (n_array_size(ls_ents)) {
+-        tn_fn_cmp cmpf;
+-        if ((cmpf = select_cmpf(cmdctx->_flags)))
+-            n_array_sort_ex(ls_ents, cmpf);
+-        
+         rc = do_ls(ls_ents, cmdctx, evrs);
+         
+         if (cmpf)
+@@ -419,6 +418,7 @@ static void ls_summary(struct cmdctx *cmdctx, struct pkg *pkg)
+     
+     if ((s = pkguinf_get(pkgu, PKGUINF_SUMMARY)))
+         cmdctx_printf(cmdctx, "    %s\n", s);
++
+     pkguinf_free(pkgu);
+ }
+ 

================================================================
Index: packages/poldek/poldek.spec
diff -u packages/poldek/poldek.spec:1.443 packages/poldek/poldek.spec:1.444
--- packages/poldek/poldek.spec:1.443	Tue Mar 27 21:18:43 2012
+++ packages/poldek/poldek.spec	Wed Mar 28 01:36:35 2012
@@ -18,7 +18,7 @@
 %define	ver_rpm	4.5-49
 
 %define		snap	rc5
-%define		rel	6
+%define		rel	7
 Summary:	RPM packages management helper tool
 Summary(hu.UTF-8):	RPM csomagkezelést segítő eszköz
 Summary(pl.UTF-8):	Pomocnicze narzędzie do zarządzania pakietami RPM
@@ -497,6 +497,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.444  2012/03/27 23:36:35  cactus
+- rel 7; add llu -t fix - sort out also installed column
+
 Revision 1.443  2012/03/27 19:18:43  arekm
 - release 6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/poldek/poldek-git.patch?r1=1.7&r2=1.8
    http://cvs.pld-linux.org/packages/poldek/poldek.spec?r1=1.443&r2=1.444