Merge lp:~manchicken/kubuntu-debug-installer/kubuntu-debug-installer into lp:kubuntu-debug-installer

[Michael D. Stemle, Jr.]

NOW we're ready for merging. This implements https://wiki.ubuntu.com/DebuggingProgramCrash#Debug_Symbol_Packages. Added the base repo, too.

[Philip Muškovac (yofel)]

I only took a quick glance on the merge, but I think you missed the "release" repository. You have X-updates, X-security and X-proposed, but I see no place where you add X without a suffix

[Michael D. Stemle, Jr. (manchicken)]

I've added that base repository now, please re-review.

[Jonathan Thomas (echidnaman)]

One comment, when the cache update transaction finishes, you'll need to call m_backend->reload() to ensure the new package is available. (Build a new cache based on the new source info) Strange things can happen if you don't.

Looks good otherwise. Sorry for the delay in reviewing; real life has been a bit crazy lately...

review: Needs Fixing

[lp:~manchicken/kubuntu-debug-installer/kubuntu-debug-installer]

104. By Michael D. Stemle, Jr. <email address hidden> on 2013-07-22

Made change per JT's recommendation.

105. By Michael D. Stemle, Jr. <email address hidden> on 2013-07-27

Made a series of changes requested by Harold.

106. By Michael D. Stemle, Jr. <email address hidden> on 2013-07-27

Fixed some text formatting.

107. By Michael D. Stemle, Jr. <email address hidden> on 2013-07-27

Fixed some code indentation.

108. By Michael D. Stemle, Jr. <email address hidden> on 2013-08-04

Made a number of changes per Harald's list: https://code.launchpad.net/~manchicken/kubuntu-debug-installer/kubuntu-debug-installer/+merge/177273/comments/399863

Unmerged revisions

108. By Michael D. Stemle, Jr. <email address hidden> on 2013-08-04

Made a number of changes per Harald's list: https://code.launchpad.net/~manchicken/kubuntu-debug-installer/kubuntu-debug-installer/+merge/177273/comments/399863

107. By Michael D. Stemle, Jr. <email address hidden> on 2013-07-27

Fixed some code indentation.

106. By Michael D. Stemle, Jr. <email address hidden> on 2013-07-27

Fixed some text formatting.

105. By Michael D. Stemle, Jr. <email address hidden> on 2013-07-27

Made a series of changes requested by Harold.

104. By Michael D. Stemle, Jr. <email address hidden> on 2013-07-22

Made change per JT's recommendation.

103. By Michael D. Stemle, Jr. <email address hidden> on 2013-07-17

Added the base repo.

102. By Michael D. Stemle, Jr. <email address hidden> on 2013-07-16

Fixed a small bug when debug packages weren't found.

101. By Michael D. Stemle, Jr. <email address hidden> on 2013-07-16

Added the changes for sources.list and refreshing cache: https://wiki.ubuntu.com/DebuggingProgramCrash#Debug_Symbol_Packages

100. By Michael D. Stemle, Jr. <email address hidden> on 2013-07-06

I now have the sources add working.

99. By Michael D. Stemle, Jr. <email address hidden> on 2013-07-05

Adding LSB stuff from Herald Sitter (THANKS!) and adding some code to set up repos.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2010-09-16 13:06:47 +0000
+++ CMakeLists.txt	2013-07-22 19:46:26 +0000
@@ -4,6 +4,8 @@
 find_package(QApt REQUIRED)
 include (KDE4Defaults)
 
+add_definitions(-DKDE_DEFAULT_DEBUG_AREA=8675309)
+
 macro_log_feature(QAPT_FOUND "QApt" "High-level Qt wrapper/Apt implementation around the Apt-pkg library"
                   "http://kubuntu.org" FALSE "" "Used to look up packages")
 

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2010-09-16 14:19:01 +0000
+++ src/CMakeLists.txt	2013-07-22 19:46:26 +0000
@@ -2,6 +2,8 @@
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 set(installdbgsymbols_SRCS
+    QAptDecorator.cpp
+    LSBRelease.cpp
     DebugFinder.cpp
     DebugInstaller.cpp
     main.cpp

=== modified file 'src/DebugFinder.cpp'
--- src/DebugFinder.cpp	2012-10-30 15:16:47 +0000
+++ src/DebugFinder.cpp	2013-07-22 19:46:26 +0000
@@ -2,6 +2,7 @@
   Copyright © 2010 Harald Sitter <[e-mail]>
   Copyright © 2010 Felix Geyer <[e-mail]>
   Copyright © 2010 Jonathan Thomas <[e-mail]>
+  Copyright © 2013 Michael D. Stemle, Jr. <[e-mail]>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
@@ -21,18 +22,35 @@
 */
 
 #include "DebugFinder.h"
+#include "LSBRelease.h"
+#include "QAptDecorator.h"
 
 #include <QtCore/QStringList>
 #include <QtCore/QThread>
+#include <QtCore/QFile>
+#include <QtCore/QDir>
+#include <QtCore/QDirIterator>
+#include <QtCore/QTextStream>
 
 #include <LibQApt/Backend>
+#include <LibQApt/SourceEntry>
+#include <LibQApt/SourcesList>
+#include <LibQApt/Transaction>
+#include <iostream>
+
+#include <KDebug>
+#include <KLocalizedString>
+#include <KMessageBox>
 
 DebugFinder::DebugFinder(QObject *parent) :
     QObject(parent),
     m_backend(new QApt::Backend(this)),
     m_stop(false)
 {
+    kDebug() << "INIT!!!!!\n";
     m_backend->init();
+    
+    m_txn = NULL;
 }
 
 QApt::Package *DebugFinder::getDbgPkg(QApt::Package *package)
@@ -69,17 +87,18 @@
     return 0;
 }
 
-void DebugFinder::find(const QString &file)
+void DebugFinder::find()
 {
     if (m_stop) {
         return;
     }
 
-    QApt::Package *package = m_backend->packageForFile(file);
+    QApt::Package *package = m_backend->packageForFile(m_file);
 
     QApt::Package *dbgPkg = getDbgPkg(package);
     if (!dbgPkg) {
-        emit foundNoDbgPkg(file);
+        kDebug() << "No debug package found for: " << m_file;
+        emit foundNoDbgPkg(m_file);
     } else if (dbgPkg->isInstalled()) {
         emit alreadyInstalled();
     } else {
@@ -91,3 +110,130 @@
 {
     m_stop = true;
 }
+
+void DebugFinder::startFinding(const QString &file)
+{
+  QString headerText = i18n("<b>Adding debug symbol sources</b>");
+  m_progress.setLabelText(headerText);
+  m_file = file;
+  connect(this, SIGNAL(updateFinishing()), this, SLOT(onUpdateFinished()));
+//   connect(this, SIGNAL(sourcesModificationFinished()), m_backend, SLOT(updateCache()));
+  
+  // Construct our list hard-coded sources...
+  LSBRelease lsb;
+  QString codename(lsb.codename());
+  QApt::SourceEntryList hcRepoList;
+  hcRepoList.append(QApt::SourceEntry(QString(REPO_ARG_BASE).arg(codename), QString(DDEB_REPO_FILE)));
+  hcRepoList.append(QApt::SourceEntry(QString(REPO_ARG_UPDATES).arg(codename), QString(DDEB_REPO_FILE)));
+  hcRepoList.append(QApt::SourceEntry(QString(REPO_ARG_SECURITY).arg(codename), QString(DDEB_REPO_FILE)));
+  hcRepoList.append(QApt::SourceEntry(QString(REPO_ARG_PROPOSED).arg(codename), QString(DDEB_REPO_FILE)));
+  
+  // First, see if the source exists...
+  QApt::SourcesList sourceList(this);
+  
+  int sourceCount = sourceList.entries().count();
+  
+  foreach (QApt::SourceEntry repo, hcRepoList)
+  {
+    sourceList.addEntry(repo); // This method has a dup check
+  }
+  m_progress.progressBar()->setMaximum(100);
+
+  // If we affected the list, save!
+  if (sourceList.entries().count() > sourceCount) {
+    m_srcUpdated = 0;
+    sourceList.save();
+    kDebug() << "Entries saved, updating backend cache...";
+
+    m_txn = m_backend->updateCache();
+    
+    m_txn->setLocale(QLatin1String(setlocale(LC_MESSAGES, 0)));
+    
+    connect(&m_progress, SIGNAL(cancelClicked()), m_txn, SLOT(cancel()));
+    connect(m_txn, SIGNAL(errorOccurred(QApt::ErrorCode)), this, SLOT(onAptError(QApt::ErrorCode)));
+    connect(m_txn, SIGNAL(statusChanged(QApt::TransactionStatus)), this, SLOT(onTxnStatusChanged(QApt::TransactionStatus)));
+    connect(m_txn, SIGNAL(progressChanged(int)), this, SLOT(onProgressChanged(int)));
+    connect(m_txn, SIGNAL(finished(QApt::ExitStatus)), this, SLOT(onUpdateFinished()));
+
+    m_txn->run();
+    kDebug() << "FinishedStatus: " << QApt::FinishedStatus;
+  } else {
+    emit updateFinishing();
+  }
+  
+  kDebug() << "Done with startFinding()!";
+}
+
+// The update is finished!
+void DebugFinder::onUpdateFinished()
+{
+  kDebug() << "Done with updateCache(), reloading cache...";
+  m_backend->reloadCache();
+  
+	kDebug() << "I'm done.";
+  m_progress.progressBar()->setValue(100);
+	
+	this->find();
+	
+	return;
+}
+
+void DebugFinder::onTxnStatusChanged(QApt::TransactionStatus status)
+{
+  QString headerText;
+
+  kDebug() << "cache widget: transaction status changed" << status;
+  
+  if (this->m_txn == NULL) {
+    kDebug() << "NULL transaction.";
+    return;
+  }
+  
+  switch (status) {
+    case QApt::DownloadingStatus:
+      if (this->m_txn->role() == QApt::UpdateCacheRole)
+      {
+        headerText = i18n("<b>Updating software sources</b>");
+      }
+      else
+      {
+        headerText = i18n("<b>Downloading Packages</b>");
+      }
+
+      m_progress.setLabelText(headerText);
+      break;
+
+    case QApt::FinishedStatus:
+      headerText = i18n("<b>Finished.</b>");
+      m_progress.setLabelText(headerText);
+      break;
+
+    default:
+      break;
+  }
+}
+
+void DebugFinder::onAptError(QApt::ErrorCode errcode)
+{
+  QString errmsg = QAptDecorator::errorText(errcode, this->m_txn);
+  kDebug() << "Got an error: " << errmsg;
+  
+  KMessageBox::error(
+    NULL,
+    i18nc("@info Error message", "Error updating sources"
+      " after configuring debug sources"),
+    i18nc("@title:window", "Failed updating sources")
+  );
+}
+
+void DebugFinder::onProgressChanged(int progress)
+{
+  kDebug() << "Progress changed to " << progress;
+  
+  int presentProgress = progress;
+
+  if (progress >= 100) {
+    presentProgress = 0;
+  }
+  m_progress.progressBar()->setValue(presentProgress);
+}

=== modified file 'src/DebugFinder.h'
--- src/DebugFinder.h	2012-10-30 15:16:47 +0000
+++ src/DebugFinder.h	2013-07-22 19:46:26 +0000
@@ -1,6 +1,7 @@
 /*
   Copyright © 2010 Harald Sitter <[e-mail]>
   Copyright © 2010 Jonathan Thomas <[e-mail]>
+  Copyright © 2013 Michael D. Stemle, Jr. <[e-mail]>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
@@ -22,13 +23,25 @@
 #ifndef DEBUGFINDER_H
 #define DEBUGFINDER_H
 
+#include <LibQApt/Globals>
+
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
+#include <KProgressDialog>
+
+#define REPO_ARG_BASE       "deb http://ddebs.ubuntu.com %1 main restricted universe multiverse"
+#define REPO_ARG_UPDATES    "deb http://ddebs.ubuntu.com %1-updates main restricted universe multiverse"
+#define REPO_ARG_SECURITY   "deb http://ddebs.ubuntu.com %1-security main restricted universe multiverse"
+#define REPO_ARG_PROPOSED   "deb http://ddebs.ubuntu.com %1-proposed main restricted universe multiverse"
+#define DDEB_REPO_FILE      "/etc/apt/sources.list.d/ddebs.list"
 
 namespace QApt {
     class Backend;
     class Package;
-}
+    class SourceEntry;
+    class SourcesList;
+    class Transaction;
+};
 
 class DebugFinder : public QObject
 {
@@ -36,18 +49,32 @@
 public:
     explicit DebugFinder(QObject *parent = 0);
 
+    void performUpdate();
+
 public slots:
-    void find(const QString &file);
+    void startFinding(const QString &file);
+    void find();
     void stop();
-
+    void onTxnStatusChanged(QApt::TransactionStatus status);
+    void onAptError(QApt::ErrorCode errcode);
+    void onUpdateFinished();
+    void onProgressChanged(int progress);
+    
 signals:
     void foundDbgPkg(const QString &dbgpkg);
-    void foundNoDbgPkg(const QString &file);
+    void foundNoDbgPkg(const QString &dbgpkg);
     void alreadyInstalled();
+    void updateFinishing();
 
 private:
     QApt::Package *getDbgPkg(QApt::Package *package);
     QApt::Backend *m_backend;
+    QApt::Transaction *m_txn;
+    KProgressDialog m_progress;
+    QString m_file;
+    int m_srcCount;
+    int m_srcUpdated;
+    int m_lastProgress;
 
     bool m_stop;
 };

=== modified file 'src/DebugInstaller.cpp'
--- src/DebugInstaller.cpp	2011-09-26 13:35:14 +0000
+++ src/DebugInstaller.cpp	2013-07-22 19:46:26 +0000
@@ -1,6 +1,7 @@
 /*
   Copyright © 2010 Harald Sitter <[e-mail]>
   Copyright © 2010 Jonathan Thomas <[e-mail]>
+  Copyright © 2013 Michael D. Stemle, Jr. <[e-mail]>
 
   This program is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License as
@@ -163,7 +164,7 @@
     progressBar()->setMaximum(m_args.count());
     incrementProgress();
 
-    m_finder = new DebugFinder;
+    m_finder = new DebugFinder(this);
     connect(m_finder, SIGNAL(foundDbgPkg(QString)), this, SLOT(foundDbgPkg(QString)));
     connect(m_finder, SIGNAL(foundNoDbgPkg(QString)), this, SLOT(foundNoDbgPkg(QString)));
     connect(m_finder, SIGNAL(alreadyInstalled()), this, SLOT(alreadyInstalled()));
@@ -173,7 +174,7 @@
     m_finderThread->start();
 
     foreach (const QString &file, m_args) {
-        QMetaObject::invokeMethod(m_finder, "find", Qt::QueuedConnection,
+        QMetaObject::invokeMethod(m_finder, "startFinding", Qt::QueuedConnection,
                                   Q_ARG(QString, file));
     }
 }

=== added file 'src/LSBRelease.cpp'
--- src/LSBRelease.cpp	1970-01-01 00:00:00 +0000
+++ src/LSBRelease.cpp	2013-07-22 19:46:26 +0000
@@ -0,0 +1,66 @@
+/*
+  Copyright (C) 2012 Harald Sitter <[e-mail]>
+ 
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of
+  the License or (at your option) version 3 or any later version
+  accepted by the membership of KDE e.V. (or its successor approved
+  by the membership of KDE e.V.), which shall act as a proxy
+  defined in Section 14 of version 3 of the license.
+ 
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+ 
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+ 
+#include "LSBRelease.h"
+ 
+#include <QtCore/QFile>
+ 
+#include <KDebug>
+#include <KLocalizedString>
+ 
+LSBRelease::LSBRelease()
+{
+    QFile file("/etc/lsb-release");
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        kDebug() << "Could not open /etc/lsb-release, aborting LSB";
+        QString unknown = i18nc("@label", "Unknown");
+        m_id = unknown;
+        m_release = unknown;
+        m_codename = unknown;
+        m_description = unknown;
+        return;
+    }
+ 
+    // List of valid column identifiers
+    QString line;
+    QStringList comps;
+    while (!file.atEnd()) {
+        line = file.readLine();
+        comps = line.split(QChar('='));
+// #warning unknown set?
+        Q_ASSERT(comps.size() == 2);
+        QString key = comps.at(0);
+        QString value = comps.at(1).trimmed();
+        if (key == QLatin1String("DISTRIB_ID"))
+            m_id = value;
+        else if (key == QLatin1String("DISTRIB_RELEASE"))
+            m_release = value;
+        else if (key == QLatin1String("DISTRIB_CODENAME"))
+            m_codename = value;
+        else if (key == QLatin1String("DISTRIB_DESCRIPTION"))
+            m_description = value;
+        else
+            Q_ASSERT(false); // Should not happen!
+    }
+ 
+// #warning unknown set?
+    if (m_id.isEmpty() || m_release.isEmpty())
+        Q_ASSERT(false); // meh.
+}
\ No newline at end of file

=== added file 'src/LSBRelease.h'
--- src/LSBRelease.h	1970-01-01 00:00:00 +0000
+++ src/LSBRelease.h	2013-07-22 19:46:26 +0000
@@ -0,0 +1,43 @@
+/*
+  Copyright (C) 2012 Harald Sitter <[e-mail]>
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of
+  the License or (at your option) version 3 or any later version
+  accepted by the membership of KDE e.V. (or its successor approved
+  by the membership of KDE e.V.), which shall act as a proxy
+  defined in Section 14 of version 3 of the license.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef LSBRELEASE_H
+#define LSBRELEASE_H
+
+#include <QtCore/QString>
+
+class LSBRelease
+{
+public:
+    LSBRelease();
+
+    QString id() { return m_id; }
+    QString release() { return m_release; }
+    QString codename() { return m_codename; }
+    QString description() { return m_description; }
+
+private:
+    QString m_id;
+    QString m_release;
+    QString m_codename;
+    QString m_description;
+};
+
+#endif // LSBRELEASE_H

=== added file 'src/QAptDecorator.cpp'
--- src/QAptDecorator.cpp	1970-01-01 00:00:00 +0000
+++ src/QAptDecorator.cpp	2013-07-22 19:46:26 +0000
@@ -0,0 +1,80 @@
+/*
+  Copyright © 2010 Jonathan Thomas <[e-mail]> (cacheupdate example in QApt)
+  Copyright © 2013 Michael D. Stemle, Jr. <[e-mail]>
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of
+  the License or (at your option) version 3 or any later version
+  accepted by the membership of KDE e.V. (or its successor approved
+  by the membership of KDE e.V.), which shall act as a proxy
+  defined in Section 14 of version 3 of the license.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <QtCore/QString>
+
+#include <LibQApt/Globals>
+#include <KLocalizedString>
+#include "QAptDecorator.h"
+
+QString QAptDecorator::errorText(QApt::ErrorCode error, QApt::Transaction *trans)
+{
+  QString text;
+
+  switch (error) {
+    case QApt::InitError:
+      text = i18nc("@label", "The package system could not be initialized, your "
+        "configuration may be broken.");
+      break;
+    case QApt::LockError:
+      text = i18nc("@label",
+        "Another application seems to be using the package "
+        "system at this time. You must close all other package "
+        "managers before you will be able to install or remove "
+        "any packages.");
+      break;
+    case QApt::DiskSpaceError:
+      text = i18nc("@label",
+        "You do not have enough disk space in the directory "
+        "at %1 to continue with this operation.", trans->errorDetails());
+      break;
+    case QApt::FetchError:
+      text = i18nc("@label", "Could not download packages");
+      break;
+    case QApt::CommitError:
+      text = i18nc("@label", "An error occurred while applying changes:");
+      break;
+    case QApt::AuthError:
+      text = i18nc("@label",
+        "This operation cannot continue since proper "
+        "authorization was not provided");
+      break;
+    case QApt::WorkerDisappeared:
+      text = i18nc("@label", "It appears that the QApt worker has either crashed "
+        "or disappeared. Please report a bug to the QApt maintainers");
+      break;
+    case QApt::UntrustedError:
+      text = i18ncp("@label",
+        "The following package has not been verified by its author. "
+        "Downloading untrusted packages has been disallowed "
+        "by your current configuration.",
+        "The following packages have not been verified by "
+        "their authors. "
+        "Downloading untrusted packages has "
+        "been disallowed by your current configuration.",
+        trans->untrustedPackages().size());
+      break;
+    default:
+        break;
+  }
+
+  return text;
+}
\ No newline at end of file

=== added file 'src/QAptDecorator.h'
--- src/QAptDecorator.h	1970-01-01 00:00:00 +0000
+++ src/QAptDecorator.h	2013-07-22 19:46:26 +0000
@@ -0,0 +1,34 @@
+/*
+  Copyright © 2010 Jonathan Thomas <[e-mail]> (cacheupdate example in QApt)
+  Copyright © 2013 Michael D. Stemle, Jr. <[e-mail]>
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of
+  the License or (at your option) version 3 or any later version
+  accepted by the membership of KDE e.V. (or its successor approved
+  by the membership of KDE e.V.), which shall act as a proxy
+  defined in Section 14 of version 3 of the license.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef QAPTDECORATOR_H
+#define QAPTDECORATOR_H
+
+#include <LibQApt/Globals>
+#include <LibQApt/Transaction>
+
+class QAptDecorator
+{
+public:
+  static QString errorText(QApt::ErrorCode error, QApt::Transaction *trans);
+};
+
+#endif // QAPTDECORATOR_H