← Back to team overview

launchpad-reviewers team mailing list archive

Re: [Merge] lp:~wgrant/launchpad/yay-sha512 into lp:launchpad

 


Inline comments:

> --- lib/lp/archivepublisher/model/ftparchive.py	2014-01-17 02:03:41 +0000

dummy comment.

> +++ lib/lp/archivepublisher/model/ftparchive.py	2014-01-29 18:25:21 +0000
> @@ -72,7 +72,7 @@
>      DeLinkLimit 0;
>      MaxContentsChange 12000;
>      FileMode 0644;
> -}
> +};
>  
>  TreeDefault
>  {
> @@ -80,6 +80,11 @@
>      Contents::Header "%s/contents.header";
>  };
>  
> +FTPArchive
> +{
> +    SHA512 "false";
> +};
> +
>  """
>  
>  STANZA_TEMPLATE = """
> 
> === modified file 'lib/lp/archivepublisher/tests/apt-data/apt.conf'
> --- lib/lp/archivepublisher/tests/apt-data/apt.conf	2014-01-17 03:21:05 +0000
> +++ lib/lp/archivepublisher/tests/apt-data/apt.conf	2014-01-29 18:25:21 +0000
> @@ -15,7 +15,7 @@
>      DeLinkLimit 0;
>      MaxContentsChange 12000;
>      FileMode 0644;
> -}
> +};
>  
>  TreeDefault
>  {
> @@ -23,6 +23,11 @@
>      Contents::Header "/var/tmp/archive/ubuntutest-misc/contents.header";
>  };
>  
> +FTPArchive
> +{
> +    SHA512 "false";
> +};
> +
>  
>  tree "dists/hoary-test"
>  {
> 
> === modified file 'lib/lp/archivepublisher/tests/apt-data/apt_conf_single_empty_suite_test'
> --- lib/lp/archivepublisher/tests/apt-data/apt_conf_single_empty_suite_test	2014-01-17 03:21:05 +0000
> +++ lib/lp/archivepublisher/tests/apt-data/apt_conf_single_empty_suite_test	2014-01-29 18:25:21 +0000
> @@ -15,7 +15,7 @@
>      DeLinkLimit 0;
>      MaxContentsChange 12000;
>      FileMode 0644;
> -}
> +};
>  
>  TreeDefault
>  {
> @@ -23,6 +23,11 @@
>      Contents::Header "/var/tmp/archive/ubuntutest-misc/contents.header";
>  };
>  
> +FTPArchive
> +{
> +    SHA512 "false";
> +};
> +
>  
>  tree "dists/hoary-test-updates"
>  {
> 
> === modified file 'lib/lp/archivepublisher/tests/test_ftparchive.py'
> --- lib/lp/archivepublisher/tests/test_ftparchive.py	2014-01-17 03:21:05 +0000
> +++ lib/lp/archivepublisher/tests/test_ftparchive.py	2014-01-29 18:25:21 +0000
> @@ -466,7 +466,7 @@
>          # Test that a publisher run now will generate an empty apt
>          # config and nothing else.
>          apt_conf = fa.generateConfig()
> -        assert len(file(apt_conf).readlines()) == 25
> +        self.assertEqual(30, len(file(apt_conf).readlines()))
>  
>          # XXX cprov 2007-03-21: see above, do not run a-f on dev machines.
>          fa.runApt(apt_conf)
> 


-- 
https://code.launchpad.net/~wgrant/launchpad/yay-sha512/+merge/203814
Your team Launchpad code reviewers is subscribed to branch lp:launchpad.


References