author | drw <drw> | 2004-04-07 23:23:04 (UTC) |
---|---|---|
committer | drw <drw> | 2004-04-07 23:23:04 (UTC) |
commit | 0a21abab4eed64d17c4b1475569194117dab709c (patch) (unidiff) | |
tree | b4f7cdf929202dd18db86916906e957658b8e1e9 | |
parent | 52ccc71e2859ae9d738629249baeef3e3df992a2 (diff) | |
download | opie-0a21abab4eed64d17c4b1475569194117dab709c.zip opie-0a21abab4eed64d17c4b1475569194117dab709c.tar.gz opie-0a21abab4eed64d17c4b1475569194117dab709c.tar.bz2 |
Added TODO doc and a couple minor updates
-rw-r--r-- | noncore/settings/packagemanager/README | 2 | ||||
-rw-r--r-- | noncore/settings/packagemanager/TODO | 28 | ||||
-rw-r--r-- | noncore/settings/packagemanager/oipkg.cpp | 7 |
3 files changed, 31 insertions, 6 deletions
diff --git a/noncore/settings/packagemanager/README b/noncore/settings/packagemanager/README index 7b6305a..9324f9c 100644 --- a/noncore/settings/packagemanager/README +++ b/noncore/settings/packagemanager/README | |||
@@ -1,21 +1,21 @@ | |||
1 | /************************************************************************ | 1 | /************************************************************************ |
2 | /* | 2 | /* |
3 | /* Opie - Package Manager | 3 | /* Opie - Package Manager |
4 | /* ======================== | 4 | /* ======================== |
5 | /* Version 0.2.0 | 5 | /* Version 0.3.0 |
6 | /* | 6 | /* |
7 | /* A package management client for Opie | 7 | /* A package management client for Opie |
8 | /* | 8 | /* |
9 | /************************************************************************ | 9 | /************************************************************************ |
10 | 10 | ||
11 | ------------------------------------------------------- | 11 | ------------------------------------------------------- |
12 | Release Notes for Opie-PackageManager - January, 2004 | 12 | Release Notes for Opie-PackageManager - January, 2004 |
13 | ------------------------------------------------------- | 13 | ------------------------------------------------------- |
14 | 14 | ||
15 | ====================== | 15 | ====================== |
16 | = To-do = | 16 | = To-do = |
17 | ====================== | 17 | ====================== |
18 | 18 | ||
19 | - See $OPIEDIR/noncore/settings/packagemanager/TODO for more info. | 19 | - See $OPIEDIR/noncore/settings/packagemanager/TODO for more info. |
20 | 20 | ||
21 | ====================== | 21 | ====================== |
diff --git a/noncore/settings/packagemanager/TODO b/noncore/settings/packagemanager/TODO new file mode 100644 index 0000000..448ade3 --- a/dev/null +++ b/noncore/settings/packagemanager/TODO | |||
@@ -0,0 +1,28 @@ | |||
1 | /************************************************************************ | ||
2 | /* | ||
3 | /* Opie - Package Manager | ||
4 | /* ======================== | ||
5 | /* Version 0.3.0 | ||
6 | /* | ||
7 | /* A package management client for Opie | ||
8 | /* | ||
9 | /************************************************************************ | ||
10 | |||
11 | --------------------------------------------- | ||
12 | To-do for Opie-PackageManager - April, 2004 | ||
13 | --------------------------------------------- | ||
14 | |||
15 | ====================== | ||
16 | = Current release = | ||
17 | ====================== | ||
18 | |||
19 | 1. Save configuration information (i.e. /etc/ipkg.conf) | ||
20 | 2. Link non-root destination apps | ||
21 | 3. Implement QCOP interface for installing, removing, etc. | ||
22 | 4. Redesign configuration dialog | ||
23 | |||
24 | ====================== | ||
25 | = Future releases = | ||
26 | ====================== | ||
27 | |||
28 | 1. ??? \ No newline at end of file | ||
diff --git a/noncore/settings/packagemanager/oipkg.cpp b/noncore/settings/packagemanager/oipkg.cpp index 1dc23a4..5c79ba9 100644 --- a/noncore/settings/packagemanager/oipkg.cpp +++ b/noncore/settings/packagemanager/oipkg.cpp | |||
@@ -23,33 +23,32 @@ | |||
23 | -. .:....=;==+<; You should have received a copy of the GNU | 23 | -. .:....=;==+<; You should have received a copy of the GNU |
24 | -_. . . )=. = Library General Public License along with | 24 | -_. . . )=. = Library General Public License along with |
25 | -- :-=` this library; see the file COPYING.LIB. | 25 | -- :-=` this library; see the file COPYING.LIB. |
26 | If not, write to the Free Software Foundation, | 26 | If not, write to the Free Software Foundation, |
27 | Inc., 59 Temple Place - Suite 330, | 27 | Inc., 59 Temple Place - Suite 330, |
28 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
29 | 29 | ||
30 | */ | 30 | */ |
31 | 31 | ||
32 | #include "oipkg.h" | 32 | #include "oipkg.h" |
33 | 33 | ||
34 | #include <stdlib.h> | 34 | #include <stdlib.h> |
35 | #include <string.h> | 35 | #include <string.h> |
36 | 36 | ||
37 | #include <qdir.h> | 37 | #include <qdir.h> |
38 | #include <qfile.h> | 38 | #include <qfile.h> |
39 | #include <qmessagebox.h> | ||
40 | #include <qtextstream.h> | 39 | #include <qtextstream.h> |
41 | 40 | ||
42 | const QString IPKG_CONF = "/etc/ipkg.conf"; // Fully-qualified name of Ipkg primary configuration file | 41 | const QString IPKG_CONF = "/etc/ipkg.conf"; // Fully-qualified name of Ipkg primary configuration file |
43 | const QString IPKG_CONF_DIR = "/etc/ipkg"; // Directory of secondary Ipkg configuration files | 42 | const QString IPKG_CONF_DIR = "/etc/ipkg"; // Directory of secondary Ipkg configuration files |
44 | const QString IPKG_PKG_PATH = "/usr/lib/ipkg/lists"; // Directory containing server package lists | 43 | const QString IPKG_PKG_PATH = "/usr/lib/ipkg/lists"; // Directory containing server package lists |
45 | const QString IPKG_STATUS_PATH = "usr/lib/ipkg/status"; // Destination status file location | 44 | const QString IPKG_STATUS_PATH = "usr/lib/ipkg/status"; // Destination status file location |
46 | 45 | ||
47 | OIpkg *oipkg; | 46 | OIpkg *oipkg; |
48 | 47 | ||
49 | // Ipkg callback functions | 48 | // Ipkg callback functions |
50 | 49 | ||
51 | int fsignalIpkgMessage( ipkg_conf_t */*conf*/, message_level_t /*level*/, char *msg ) | 50 | int fsignalIpkgMessage( ipkg_conf_t */*conf*/, message_level_t /*level*/, char *msg ) |
52 | { | 51 | { |
53 | oipkg->ipkgMessage( msg ); | 52 | oipkg->ipkgMessage( msg ); |
54 | return 0; | 53 | return 0; |
55 | } | 54 | } |
@@ -69,49 +68,47 @@ int fIpkgFiles( char */*name*/, char *desc, char */*version*/, pkg_state_status_ | |||
69 | void */*userdata*/ ) | 68 | void */*userdata*/ ) |
70 | { | 69 | { |
71 | oipkg->ipkgList( desc ); | 70 | oipkg->ipkgList( desc ); |
72 | return 0; | 71 | return 0; |
73 | } | 72 | } |
74 | 73 | ||
75 | OIpkg::OIpkg( Config *config, QObject *parent, const char *name ) | 74 | OIpkg::OIpkg( Config *config, QObject *parent, const char *name ) |
76 | : QObject( parent, name ) | 75 | : QObject( parent, name ) |
77 | , m_config( config ) | 76 | , m_config( config ) |
78 | , m_confInfo( NULL ) | 77 | , m_confInfo( NULL ) |
79 | , m_ipkgExecOptions( 0 ) | 78 | , m_ipkgExecOptions( 0 ) |
80 | , m_ipkgExecVerbosity( 1 ) | 79 | , m_ipkgExecVerbosity( 1 ) |
81 | { | 80 | { |
82 | oipkg = this; | 81 | oipkg = this; |
83 | 82 | ||
84 | // Initialize libipkg | 83 | // Initialize libipkg |
85 | if ( ipkg_init( &fsignalIpkgMessage, &fIpkgResponse, &m_ipkgArgs ) ) | 84 | ipkg_init( &fsignalIpkgMessage, &fIpkgResponse, &m_ipkgArgs ); |
86 | QMessageBox::critical( 0, tr( "OIpkg" ), tr( "Error initialing libipkg" ) ); | ||
87 | 85 | ||
88 | // Default ipkg run-time arguments | 86 | // Default ipkg run-time arguments |
89 | m_ipkgArgs.noaction = false; | 87 | m_ipkgArgs.noaction = false; |
90 | m_ipkgArgs.force_defaults = true; | 88 | m_ipkgArgs.force_defaults = true; |
91 | } | 89 | } |
92 | 90 | ||
93 | OIpkg::~OIpkg() | 91 | OIpkg::~OIpkg() |
94 | { | 92 | { |
95 | // Upon destruction, ensure that items in config list are deleted with list | 93 | // Upon destruction, ensure that items in config list are deleted with list |
96 | if ( m_confInfo ) | 94 | if ( m_confInfo ) |
97 | m_confInfo->setAutoDelete( true ); | 95 | m_confInfo->setAutoDelete( true ); |
98 | 96 | ||
99 | // Free up libipkg resources | 97 | // Free up libipkg resources |
100 | if ( ipkg_deinit( &m_ipkgArgs ) ) | 98 | ipkg_deinit( &m_ipkgArgs ); |
101 | QMessageBox::critical( 0, tr( "OIpkg" ), tr( "Error freeing libipkg" ) ); | ||
102 | } | 99 | } |
103 | 100 | ||
104 | OConfItemList *OIpkg::configItems() | 101 | OConfItemList *OIpkg::configItems() |
105 | { | 102 | { |
106 | // Retrieve all configuration items | 103 | // Retrieve all configuration items |
107 | return filterConfItems(); | 104 | return filterConfItems(); |
108 | } | 105 | } |
109 | 106 | ||
110 | OConfItemList *OIpkg::servers() | 107 | OConfItemList *OIpkg::servers() |
111 | { | 108 | { |
112 | // Retrieve only servers | 109 | // Retrieve only servers |
113 | return filterConfItems( OConfItem::Source ); | 110 | return filterConfItems( OConfItem::Source ); |
114 | } | 111 | } |
115 | 112 | ||
116 | OConfItemList *OIpkg::destinations() | 113 | OConfItemList *OIpkg::destinations() |
117 | { | 114 | { |