Merge lp:~jibel/synaptic/bug.153966.452564 into lp:synaptic

[Jean-Baptiste Lallement]

Tested with changelogs.ubuntu.com and medibuntu repo.

2 points still remains and need a fix:
- TODO: Need to use supportedOrigins instead of hard coded "Ubuntu". This is a problem for Debian.
- BUG: When pkgAcquire::Run() fails the item is not dequeued. Only visible if a changelog completely failed and the next succeeded, the messages are overwritten in the changelog dialog.

help would be much appreciated.

[Michael Vogt (mvo)]

Thanks, diff looks good. For the todos:
1) is not too bad, the hardcoded value is there, but its all about LP, should prbably be a patch or a distro specific thing, but ok for now
2) sounds like a bug in libapt actually :/ Do you have steps to reproduce?

[Michael Vogt (mvo)]

Thanks! I merged it into the lucid branch, the next step is to merge into trunk/ and upload to debian.

=== modified file 'common/rpackage.cc'
--- common/rpackage.cc	2010-02-17 22:12:04 +0000
+++ common/rpackage.cc	2010-04-14 20:00:37 +0000
@@ -892,49 +892,76 @@
    return filename;
 }
 
-
-string RPackage::getChangelogFile(pkgAcquire *fetcher)
+string RPackage::getChangelogURI() 
 {
-   string prefix;
-   string srcpkg = srcPackage();
-   string descr("Changelog for ");
-   descr+=name();
-
-   string src_section=section();
-   if(src_section.find('/')!=src_section.npos)
-      src_section=string(src_section, 0, src_section.find('/'));
-   else
-      src_section="main";
-
-   prefix+=srcpkg[0];
-   if(srcpkg.size()>3 && srcpkg[0]=='l' && srcpkg[1]=='i' && srcpkg[2]=='b')
-      prefix=std::string("lib")+srcpkg[3];
-
-   string verstr;
-   if(availableVersion() != NULL) 
-      verstr = availableVersion();
-   
-   if(verstr.find(':')!=verstr.npos)
-      verstr=string(verstr, verstr.find(':')+1);
    char uri[512];
-   snprintf(uri,512,"http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog",
+   //FIXME: get the supportedOrigins from pkgStatus
+   if(origin() == "Debian") {
+      string prefix;
+      string srcpkg = srcPackage();
+
+      string src_section=section();
+      if(src_section.find('/')!=src_section.npos)
+         src_section=string(src_section, 0, src_section.find('/'));
+      else
+         src_section="main";
+
+      prefix+=srcpkg[0];
+      if(srcpkg.size()>3 && srcpkg[0]=='l' && srcpkg[1]=='i' && srcpkg[2]=='b')
+         prefix=std::string("lib")+srcpkg[3];
+
+      string verstr;
+      if(availableVersion() != NULL) 
+         verstr = availableVersion();
+      
+      if(verstr.find(':')!=verstr.npos)
+         verstr=string(verstr, verstr.find(':')+1);
+
+      snprintf(uri,512,"http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog",
                                src_section.c_str(),
                                prefix.c_str(),
                                srcpkg.c_str(),
                                srcpkg.c_str(),
                                verstr.c_str());
-
-   //cout << "uri is: " << uri << endl;
-
+   } else {
+       string pkgfilename = findTagFromPkgRecord("Filename");
+       pkgfilename = pkgfilename.substr(0, pkgfilename.find_last_of('.')) + ".changelog";
+       snprintf(uri,512,"http://%s/%s",
+               getCandidateOriginSiteUrl().c_str(),
+               pkgfilename.c_str());
+   }
+   return string(uri);
+}
+
+string RPackage::getChangelogFile(pkgAcquire *fetcher)
+{
+   string descr("Changelog for ");
+   descr+=name();
+
+   string uri = getChangelogURI();
    // no need to translate this, the changelog is in english anyway
    string filename = RTmpDir()+"/tmp_cl";
+
+   new pkgAcqFileSane(fetcher, uri, descr, name(), filename);
+   //cerr << "**DEBUG** origin: " << origin() << endl;
+   //cerr << "**DEBUG** uri: " << uri << endl;
+   //cerr << "**DEBUG** filename: " << filename << endl;
+
    ofstream out(filename.c_str());
-   out << "Failed to fetch the changelog for " << name() << endl;
-   out << "URI was: " << uri << endl;
+   if(fetcher->Run() == pkgAcquire::Failed) {
+      out << "Failed to download the list of changes. " << endl;
+      out << "Please check your Internet connection." << endl;
+      // FIXME: Need to dequeue the item
+   } else {
+      struct stat filestatus;
+      stat(filename.c_str(), &filestatus );
+      if (filestatus.st_size == 0) {
+         out << "This change is not coming from a source that supports changelogs.\n" << endl;
+         out << "Failed to fetch the changelog for " << name() << endl;
+         out << "URI was: " << uri << endl;
+      }
+   };
    out.close();
-   new pkgAcqFileSane(fetcher, uri, descr, name(), filename);
-
-   fetcher->Run();
 
    return filename;
 }

=== modified file 'common/rpackage.h'
--- common/rpackage.h	2010-01-25 10:17:45 +0000
+++ common/rpackage.h	2010-04-14 20:00:37 +0000
@@ -244,6 +244,9 @@
    RPackage(RPackageLister *lister, pkgDepCache *depcache,
             pkgRecords *records, pkgCache::PkgIterator &pkg);
    ~RPackage();
+
+   private:
+   string getChangelogURI();
 };
 
 

=== modified file 'debian/patches/01_ubuntu_changelog.dpatch'
--- debian/patches/01_ubuntu_changelog.dpatch	2009-06-04 16:12:33 +0000
+++ debian/patches/01_ubuntu_changelog.dpatch	2010-04-14 20:00:37 +0000
@@ -5,19 +5,58 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad synaptic-0.56/common/rpackage.cc /tmp/dpep.Ri9fRS/synaptic-0.56/common/rpackage.cc
---- synaptic-0.56/common/rpackage.cc	2005-02-18 13:28:43.000000000 +0100
-+++ /tmp/dpep.Ri9fRS/synaptic-0.56/common/rpackage.cc	2005-02-18 14:39:17.005309176 +0100
-@@ -810,7 +810,7 @@
-    if(verstr.find(':')!=verstr.npos)
-       verstr=string(verstr, verstr.find(':')+1);
+diff -urNad bug.153966.452564~/common/rpackage.cc bug.153966.452564/common/rpackage.cc
+--- bug.153966.452564~/common/rpackage.cc	2010-04-14 00:16:09.000000000 +0200
++++ bug.153966.452564/common/rpackage.cc	2010-04-14 00:20:52.000000000 +0200
+@@ -896,7 +896,7 @@
+ {
     char uri[512];
--   snprintf(uri,512,"http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog",
-+   snprintf(uri,512,"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog",
+    //FIXME: get the supportedOrigins from pkgStatus
+-   if(origin() == "Debian") {
++   if(origin() == "Ubuntu") {
+       string prefix;
+       string srcpkg = srcPackage();
+ 
+@@ -917,7 +917,7 @@
+       if(verstr.find(':')!=verstr.npos)
+          verstr=string(verstr, verstr.find(':')+1);
+ 
+-      snprintf(uri,512,"http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog",
++      snprintf(uri,512,"http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog",
                                 src_section.c_str(),
                                 prefix.c_str(),
                                 srcpkg.c_str(),
-@@ -1293,7 +1293,7 @@
+@@ -956,9 +956,23 @@
+       struct stat filestatus;
+       stat(filename.c_str(), &filestatus );
+       if (filestatus.st_size == 0) {
+-         out << "This change is not coming from a source that supports changelogs.\n" << endl;
+-         out << "Failed to fetch the changelog for " << name() << endl;
+-         out << "URI was: " << uri << endl;
++      // FIXME: Use supportedOrigins
++         if(origin() == "Ubuntu") {
++            string verstr;
++            if(availableVersion() != NULL) 
++               verstr = availableVersion();
++            
++            if(verstr.find(':')!=verstr.npos)
++               verstr=string(verstr, verstr.find(':')+1);
++            out << "The list of changes is not available yet.\n" << endl;
++            out << "Please use http://launchpad.net/ubuntu/+source/"<< srcPackage() << 
++                "/" << verstr << "/+changelog" << endl;
++            out << "until the changes become available or try again later." << endl;
++         } else {
++            out << "This change is not coming from a source that supports changelogs.\n" << endl;
++            out << "Failed to fetch the changelog for " << name() << endl;
++            out << "URI was: " << uri << endl;
++         }
+       }
+    };
+    out.close();
+diff -urNad bug.153966.452564~/common/rpackagestatus.cc bug.153966.452564/common/rpackagestatus.cc
+--- bug.153966.452564~/common/rpackagestatus.cc	2010-04-13 23:31:39.000000000 +0200
++++ bug.153966.452564/common/rpackagestatus.cc	2010-04-14 00:18:59.000000000 +0200
+@@ -69,7 +69,7 @@
        markUnsupported = true;
  
        // read supported labels
@@ -26,12 +65,21 @@
        stringstream sst1(labels);
        while(!sst1.eof()) {
  	 sst1 >> s;
-@@ -1301,7 +1301,7 @@
+@@ -77,7 +77,7 @@
+       }
+ 
+       // read supported origins
+-      origin = _config->Find("Synaptic::supported-origins", "Debian");
++      origin = _config->Find("Synaptic::supported-origins", "Ubuntu");
+       stringstream sst2(origin);
+       while(!sst2.eof()) {
+ 	 sst2 >> s;
+@@ -85,7 +85,7 @@
        }
        
        // read supported components
 -      components = _config->Find("Synaptic::supported-components", "main updates/main");
 +      components = _config->Find("Synaptic::supported-components", "main updates/main restricted");
-       stringstream sst2(components);
-       while(!sst2.eof()) {
- 	 sst2 >> s;
+       stringstream sst3(components);
+       while(!sst3.eof()) {
+ 	 sst3 >> s;