Attachment 218592 Details for Bug 394728

[patch] proposed patch for #9

setkeeppackages.diff (text/plain), 1.87 KB, created by Jan Kupec on 2008-05-28 12:23:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Kupec

Created: 2008-05-28 12:23:40 UTC

Size: 1.87 KB

patch

obsolete

>Index: zypp/RepoInfo.cc
>===================================================================
>--- zypp/RepoInfo.cc	(revision 10251)
>+++ zypp/RepoInfo.cc	(working copy)
>@@ -30,13 +30,21 @@
>   /** RepoInfo implementation. */
>   struct RepoInfo::Impl
>   {
>+    enum FlagsDeterminedState
>+    {
>+      FLAG_ENABLED      = 1,
>+      FLAG_AUTOREFRESH  = 2,
>+      FLAG_GPGCHECK     = 4,
>+      FLAG_KEEPPACKAGES = 8
>+    };
> 
>     Impl()
>       : enabled (false),
>         autorefresh(false),
>         gpgcheck(true),
> 	keeppackages(false),
>-        type(repo::RepoType::NONE_e)
>+        type(repo::RepoType::NONE_e),
>+        flags_determined(0)
>     {}
> 
>     ~Impl()
>@@ -73,6 +81,7 @@
>     Pathname metadatapath;
>     Pathname packagespath;
>     DefaultIntegral<unsigned,defaultPriority> priority;
>+    int flags_determined;
>   public:
> 
>   private:
>@@ -128,18 +137,21 @@
>   RepoInfo & RepoInfo::setEnabled( bool enabled )
>   {
>     _pimpl->enabled = enabled;
>+    _pimpl->flags_determined |= Impl::FLAG_ENABLED;
>     return *this;
>   }
> 
>   RepoInfo & RepoInfo::setAutorefresh( bool autorefresh )
>   {
>     _pimpl->autorefresh = autorefresh;
>+    _pimpl->flags_determined |= Impl::FLAG_AUTOREFRESH;
>     return *this;
>   }
> 
>   RepoInfo & RepoInfo::setGpgCheck( bool check )
>   {
>     _pimpl->gpgcheck = check;
>+    _pimpl->flags_determined |= Impl::FLAG_GPGCHECK;
>     return *this;
>   }
> 
>@@ -157,7 +169,8 @@
> 
>   RepoInfo & RepoInfo::addBaseUrl( const Url &url )
>   {
>-    if ( _pimpl->baseUrls.size()==0 ) //first url
>+    // set only if not already set (bnc #394728)
>+    if (!(_pimpl->flags_determined & Impl::FLAG_KEEPPACKAGES))
>     {
>       if ( media::MediaAccess::downloads( url ) )
>         setKeepPackages(true);
>@@ -235,6 +248,7 @@
>   RepoInfo & RepoInfo::setKeepPackages( bool keep )
>   {
>     _pimpl->keeppackages = keep;
>+    _pimpl->flags_determined |= Impl::FLAG_KEEPPACKAGES;
>     return *this;
>   }
>

Actions: View | Diff

Attachments on bug 394728: 218354 | 218355 | 218525 | 218592 | 218708