mingw-cvs Mailing List for MinGW - Minimalist GNU for Windows

Update of /cvsroot/mingw/mingw-get
In directory vz-cvs-4.sog:/tmp/cvs-serv28525

Modified Files:
	ChangeLog 
Log Message:
Rework previously inadequate solution for MinGW-Bug #3424406

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v
retrieving revision 1.136
retrieving revision 1.137
diff -C2 -d -r1.136 -r1.137
*** ChangeLog	13 Mar 2012 20:24:52 -0000	1.136
--- ChangeLog	26 Mar 2012 21:20:18 -0000	1.137
***************
*** 1,2 ****
--- 1,29 ----
+ 2012-03-26  Keith Marshall  <kei...@us...>
+ 
+ 	Rework previously inadequate solution for MinGW-Bug #3424406
+ 
+ 	* src/pkgtask.h: Update copyright notice for current year.
+ 	(ACTION_MAY_SELECT): New manifest constant for use as flag; define it.
+ 	* src/pkgexec.cpp (pkgActionItem::SelectIfMostRecentFit): Assign it.
+ 
+ 	* src/pkgdeps.cpp (STATIC_INLINE): New macro; define it.
+ 	(ACTION_RECURSIVE_REINSTALL, ACTION_RECURSIVE_UPGRADE):
+ 	(ACTION_RECURSIVE_REPLACE): New action code constants; define them.
+ 	(with_flags): Original macro deleted; replace it with...
+ 	(with_request_flags): ...this new static inline function.
+ 	(if_noref, if_match, if_alias, with_download, promote): New static
+ 	inline functions; they replace original macros of the same names.
+ 	(is_recursive_action): Function no longer used; delete it.
+ 	(action_class): New static inline function; implement and use it...
+ 	(pkgXmlDocument::ResolveDependencies): ...here, to identify scheduling
+ 	requirements for packages which are already installed; depends on...
+ 	(request_mode): ...this new automatic variable; it augments and...
+ 	(recursive_mode): ...replaces this one; rename it accordingly.
+ 	(viable): Automatic variable no longer used; delete it.
+ 	[DEBUG_REQUEST & DEBUG_TRACE_DEPENDENCIES]: Emit notification for
+ 	scheduled installation.
+ 	(pkgXmlDocument::Schedule): Add an implied...
+ 	(ACTION_REMOVE): ...when scheduling a reinstallation.
+ 
  2012-03-13  Keith Marshall  <kei...@us...>
  

Update of /cvsroot/mingw/mingw-get
In directory vz-cvs-4.sog:/tmp/cvs-serv9536

Modified Files:
	ChangeLog 
Log Message:
Address reinstallation issues per MinGW-Bugs #3416013 and #3424406

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -d -r1.135 -r1.136
*** ChangeLog	12 Mar 2012 22:13:58 -0000	1.135
--- ChangeLog	13 Mar 2012 20:24:52 -0000	1.136
***************
*** 1,2 ****
--- 1,27 ----
+ 2012-03-13  Keith Marshall  <kei...@us...>
+ 
+ 	Address reinstallation issues per MinGW-Bugs #3416013 and #3424406
+ 
+ 	* src/pkgexec.cpp (reinstall_action_scheduled): New inline function.
+ 	(pkgActionItem::Execute): Use it to identify cases where...
+ 	[--reinstall]: ...implicit package removal is required, and also to
+ 	facilitate improved progress reporting in such cases.
+ 
+ 	* src/pkgdeps.cpp (is_recursive_action): New inline function.
+ 	(pkgXmlDocument::ResolveDependencies): Use it in tandem with...
+ 	(recursive_mode): ...this new automatic variable, so as to handle...
+ 	[meta-package dependency]: ...implicit recursion, to extend the scope
+ 	of the current action to the first level of non-meta dependency.
+ 	[install --reinstall]: ...reinstall original version of nominated
+ 	package, ignoring any available upgrade; extend scope of operation...
+ 	[install --reinstall --recursive]: ...to all prerequisite packages.
+ 	[upgrade --reinstall]: ...upgrade nominated package if possible; if no
+ 	upgrade available, reinstall current version; extend scope...
+ 	[upgrade --reinstall --recursive]: ...to all prerequisites.
+ 	(pkgXmlDocument::Schedule): Partially revert 2012-03-05 change;
+ 	reimplement selectively; never promote...
+ 	[install, install --reinstall]: ...these operations to become...
+ 	[upgrade]: ...this, even if available; issue diagnostic instead.
+ 
  2012-03-12  Keith Marshall  <kei...@us...>
  

Update of /cvsroot/mingw/mingw-get
In directory vz-cvs-4.sog:/tmp/cvs-serv13628

Modified Files:
	ChangeLog 
Log Message:
Rationalise implementation and usage of --all-related option.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -d -r1.134 -r1.135
*** ChangeLog	12 Mar 2012 21:07:29 -0000	1.134
--- ChangeLog	12 Mar 2012 22:13:58 -0000	1.135
***************
*** 1,4 ****
--- 1,22 ----
  2012-03-12  Keith Marshall  <kei...@us...>
  
+ 	Rationalise implementation and usage of --all-related option.
+ 
+ 	* src/pkgopts.h: Update copyright notice; add year 2012.
+ 	(OPTION_RECURSIVE, OPTION_ALL_RELATED): New constants; define them.
+ 	(pkgOpts::SetFlags): New method; declare and implement it inline.
+ 
+ 	* src/clistub.c: Update copyright notice; add year 2012.
+ 	(options) [recursive, all-related]: Redefine in terms of...
+ 	(OPTION_RECURSIVE, OPTION_ALL_RELATED): ...these.
+ 	(help_text): Update appropriately.
+ 
+ 	* src/climain.cpp: Update copyright notice; add year 2012.
+ 	(climain) [all-related]: Associate its use exclusively with...
+ 	(source, licence): ...these package processing operations; use...
+ 	(pkgOptions::SetFlags): ...this, to propagate its effect.
+ 
+ 2012-03-12  Keith Marshall  <kei...@us...>
+ 
  	Don't report failed downloads in respect of virtual packages.
  

Update of /cvsroot/mingw/mingw-get
In directory vz-cvs-4.sog:/tmp/cvs-serv3764

Modified Files:
	ChangeLog 
Log Message:
Don't report failed downloads in respect of virtual packages.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v
retrieving revision 1.133
retrieving revision 1.134
diff -C2 -d -r1.133 -r1.134
*** ChangeLog	5 Mar 2012 16:23:44 -0000	1.133
--- ChangeLog	12 Mar 2012 21:07:29 -0000	1.134
***************
*** 1,2 ****
--- 1,13 ----
+ 2012-03-12  Keith Marshall  <kei...@us...>
+ 
+ 	Don't report failed downloads in respect of virtual packages.
+ 
+ 	* src/pkginet.cpp (pkgActionItem::DownloadArchiveFiles): Clear...
+ 	[ACTION_DOWNLOAD]: ...this status flag for any package identified as
+ 	a meta-package; this corrects a further regression introduced with the
+ 	2011-11-09 update, whereby pending download requests for such virtual
+ 	packages were not cancelled, resulting in failure to install due to
+ 	failed downloads, when no download is actually required.
+ 
  2012-03-05  Keith Marshall  <kei...@us...>
  

Update of /cvsroot/mingw/mingw-get/src
In directory vz-cvs-4.sog:/tmp/cvs-serv15388/src

Modified Files:
	pkgdeps.cpp 
Log Message:
Don't suppress implied downloads for top-level actions.

Index: pkgdeps.cpp
===================================================================
RCS file: /cvsroot/mingw/mingw-get/src/pkgdeps.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** pkgdeps.cpp	9 Nov 2011 05:54:57 -0000	1.11
--- pkgdeps.cpp	5 Mar 2012 16:23:44 -0000	1.12
***************
*** 5,9 ****
   *
   * Written by Keith Marshall <kei...@us...>
!  * Copyright (C) 2009, 2010, 2011, MinGW Project
   *
   *
--- 5,9 ----
   *
   * Written by Keith Marshall <kei...@us...>
!  * Copyright (C) 2009, 2010, 2011, 2012, MinGW Project
   *
   *
***************
*** 197,201 ****
  }
  
! #define with_flags( request )       ((request) & ~(ACTION_MASK))
  #define promote( request, action )  (with_flags( request ) | with_download( action ))
  #define with_download( action )     ((action) | (ACTION_DOWNLOAD))
--- 197,201 ----
  }
  
! #define with_flags( request )       ((request) & ~(ACTION_MASK | ACTION_DOWNLOAD))
  #define promote( request, action )  (with_flags( request ) | with_download( action ))
  #define with_download( action )     ((action) | (ACTION_DOWNLOAD))
***************
*** 598,601 ****
--- 598,609 ----
  	action |= ACTION_PRIMARY;
  
+ 	/* Furthermore, any primary action must be supported by
+ 	 * an implied download activity, unless the '--print-uris'
+ 	 * option is in effect.
+ 	 */
+ 	if(  ((action & ACTION_UPGRADE) == ACTION_UPGRADE)
+ 	&&  (pkgOptions()->Test( OPTION_PRINT_URIS ) != OPTION_PRINT_URIS)  )
+ 	  action |= ACTION_DOWNLOAD;
+ 
  	/* For each candidate release in turn...
  	 */